[PATCHv3 7/9] meta: do not equip rootfss with resolv.conf when BB_NO_NETWORK

[Henning Schild <henning.schild@siemens.com>]

From: Henning Schild <henning.schild@siemens.com>

A second "line of defense" to implement BB_NO_NETWORK in Isar.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/classes/buildchroot.bbclass | 10 ++++++++--
 meta/classes/rootfs.bbclass      |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass
index 64ac450..1a8ee13 100644
--- a/meta/classes/buildchroot.bbclass
+++ b/meta/classes/buildchroot.bbclass
@@ -48,8 +48,14 @@ buildchroot_do_mounts() {
                 mount --bind '${REPO_BASE_DIR}' '${BUILDCHROOT_DIR}/base-apt'
         fi
 
-        # Refresh /etc/resolv.conf at this chance
-        cp -L /etc/resolv.conf '${BUILDCHROOT_DIR}/etc'
+        # Refresh or remove /etc/resolv.conf at this chance
+        if [ "${@repr(bb.utils.to_boolean(d.getVar('BB_NO_NETWORK')))}" = 'True' ]
+        then
+            rm -rf '${BUILDCHROOT_DIR}/etc/resolv.conf'
+        else
+            cp -L /etc/resolv.conf '${BUILDCHROOT_DIR}/etc'
+        fi
+
         ) 9>'${MOUNT_LOCKFILE}'
 EOSUDO
 }
diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index fa915f8..c67abab 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -105,7 +105,10 @@ rootfs_install_pkgs_update() {
 ROOTFS_INSTALL_COMMAND += "rootfs_install_resolvconf"
 rootfs_install_resolvconf[weight] = "1"
 rootfs_install_resolvconf() {
-    sudo cp -rL /etc/resolv.conf '${ROOTFSDIR}/etc'
+    if [ "${@repr(bb.utils.to_boolean(d.getVar('BB_NO_NETWORK')))}" != "True" ]
+    then
+        sudo cp -rL /etc/resolv.conf '${ROOTFSDIR}/etc'
+    fi
 }
 
 ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_download"
-- 
2.23.0