[PATCH] meta/classes/rootfs.bbclass:systemd-resolved fix build issue

[PATCH] meta/classes/rootfs.bbclass:systemd-resolved fix build issue

[Shivaschandra KL]

From: Shivaschandra KL <shivaschandra.k-l@siemens.com>

Building images with systemd-resolved package included using IMAGE_PREINSTALL,
fails due to dangling symlink error. This is due to pre-existing symlink
for /etc/resolv.conf, created by installation of systemd-resolved.
So we need to ensure that, we unlink and symlink existing for /etc/resolv.conf.

Signed-off-by: Shivaschandra K L <shivaschandra.k-l@siemens.com>
---
 meta/classes/rootfs.bbclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 65574a6c..1b95115a 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -134,6 +134,9 @@ rootfs_install_resolvconf[weight] = "1"
 rootfs_install_resolvconf() {
     if [ "${@repr(bb.utils.to_boolean(d.getVar('BB_NO_NETWORK')))}" != "True" ]
     then
+        if [ -L "${ROOTFSDIR}/etc/resolv.conf" ]; then
+            sudo unlink "${ROOTFSDIR}/etc/resolv.conf"
+        fi
         sudo cp -rL /etc/resolv.conf '${ROOTFSDIR}/etc'
     fi
 }
-- 
2.39.2

Re: [PATCH] meta/classes/rootfs.bbclass:systemd-resolved fix build issue

[Uladzimir Bely]

On Fri, 2023-11-24 at 05:03 -0500, Shivaschandra KL wrote:
> From: Shivaschandra KL <shivaschandra.k-l@siemens.com>
> 
> Building images with systemd-resolved package included using
> IMAGE_PREINSTALL,
> fails due to dangling symlink error. This is due to pre-existing
> symlink
> for /etc/resolv.conf, created by installation of systemd-resolved.
> So we need to ensure that, we unlink and symlink existing for
> /etc/resolv.conf.
> 
> Signed-off-by: Shivaschandra K L <shivaschandra.k-l@siemens.com>
> ---
>  meta/classes/rootfs.bbclass | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta/classes/rootfs.bbclass
> b/meta/classes/rootfs.bbclass
> index 65574a6c..1b95115a 100644
> --- a/meta/classes/rootfs.bbclass
> +++ b/meta/classes/rootfs.bbclass
> @@ -134,6 +134,9 @@ rootfs_install_resolvconf[weight] = "1"
>  rootfs_install_resolvconf() {
>      if [ "${@repr(bb.utils.to_boolean(d.getVar('BB_NO_NETWORK')))}"
> != "True" ]
>      then
> +        if [ -L "${ROOTFSDIR}/etc/resolv.conf" ]; then
> +            sudo unlink "${ROOTFSDIR}/etc/resolv.conf"
> +        fi
>          sudo cp -rL /etc/resolv.conf '${ROOTFSDIR}/etc'
>      fi
>  }
> -- 
> 2.39.2
> 

Applied to next, thanks.