[PATCHv3 6/9] base: implement BB_NO_NETWORK for apt-get

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

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

BB_NO_NETWORK should stop all fetchers from downloading stuff, but apt-get
will continue to access the network.

To make it respect the wish for no network, inject a proxy that will not
work, forcing it to eventually fail so when trying to download something.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/classes/base.bbclass                           | 13 +++++++++++++
 meta/classes/dpkg-base.bbclass                      |  4 ++--
 meta/classes/dpkg-gbp.bbclass                       |  2 +-
 meta/classes/dpkg.bbclass                           |  4 ++--
 meta/classes/image-tools-extension.bbclass          |  2 +-
 meta/classes/rootfs.bbclass                         |  2 +-
 meta/recipes-core/isar-bootstrap/isar-bootstrap.inc |  2 +-
 meta/recipes-kernel/linux/linux-custom.inc          |  4 ++--
 8 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0670430..4bd17e3 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -125,6 +125,19 @@ python() {
                 )
 }
 
+def isar_export_proxies(d):
+    deadend_proxy = 'http://this.should.fail:4242'
+    variables = ['http_proxy', 'HTTP_PROXY', 'https_proxy', 'HTTPS_PROXY',
+                    'ftp_proxy', 'FTP_PROXY' ]
+
+    if d.getVar('BB_NO_NETWORK') == "1":
+        for v in variables:
+            d.setVar(v, deadend_proxy)
+        for v in [ 'no_proxy', 'NO_PROXY' ]:
+            d.setVar(v, '')
+
+    return bb.utils.export_proxies(d)
+
 # filter out all "apt://" URIs out of SRC_URI and stick them into SRC_APT
 python() {
     src_uri = (d.getVar('SRC_URI', True) or "").split()
diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index adc0e85..0be1627 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -30,7 +30,7 @@ do_apt_fetch() {
     fi
     rm -rf ${S}
     dpkg_do_mounts
-    E="${@ bb.utils.export_proxies(d)}"
+    E="${@ isar_export_proxies(d)}"
     sudo -E chroot ${BUILDCHROOT_DIR} /usr/bin/apt-get update \
         -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \
         -o Dir::Etc::SourceParts="-" \
@@ -154,7 +154,7 @@ python do_devshell() {
 
     bb.build.exec_func('dpkg_do_mounts', d)
 
-    bb.utils.export_proxies(d)
+    isar_export_proxies(d)
 
     buildchroot = d.getVar('BUILDCHROOT_DIR')
     pp_pps = os.path.join(d.getVar('PP'), d.getVar('PPS'))
diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass
index 8a8e0f4..e2db671 100644
--- a/meta/classes/dpkg-gbp.bbclass
+++ b/meta/classes/dpkg-gbp.bbclass
@@ -12,7 +12,7 @@ GBP_EXTRA_OPTIONS ?= "--git-pristine-tar"
 
 do_install_builddeps_append() {
     dpkg_do_mounts
-    E="${@ bb.utils.export_proxies(d)}"
+    E="${@ isar_export_proxies(d)}"
     sudo -E chroot ${BUILDCHROOT_DIR} \
         apt-get install -y -o Debug::pkgProblemResolver=yes \
                         --no-install-recommends ${GBP_DEPENDS}
diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index 19d77a2..180a3a8 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -6,7 +6,7 @@ inherit dpkg-base
 # Install build dependencies for package
 do_install_builddeps() {
     dpkg_do_mounts
-    E="${@ bb.utils.export_proxies(d)}"
+    E="${@ isar_export_proxies(d)}"
     sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh ${PP}/${PPS} ${DISTRO_ARCH}
     dpkg_undo_mounts
 }
@@ -19,7 +19,7 @@ addtask devshell after do_install_builddeps
 
 # Build package from sources using build script
 dpkg_runbuild() {
-    E="${@ bb.utils.export_proxies(d)}"
+    E="${@ isar_export_proxies(d)}"
     sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \
          /isar/build.sh ${PP}/${PPS} ${DISTRO_ARCH}
 }
diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass
index 2d8a777..d4f216d 100644
--- a/meta/classes/image-tools-extension.bbclass
+++ b/meta/classes/image-tools-extension.bbclass
@@ -24,7 +24,7 @@ do_install_imager_deps() {
 
     buildchroot_do_mounts
 
-    E="${@bb.utils.export_proxies(d)}"
+    E="${@ isar_export_proxies(d)}"
     sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \
         apt-get update \
             -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \
diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 72303fe..fa915f8 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -18,7 +18,7 @@ ROOTFS_APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes"
 ROOTFS_CLEAN_FILES="/etc/hostname /etc/resolv.conf"
 
 # Useful environment variables:
-export E = "${@ bb.utils.export_proxies(d)}"
+export E = "${@ isar_export_proxies(d)}"
 export DEBIAN_FRONTEND = "noninteractive"
 # To avoid Perl locale warnings:
 export LANG = "C"
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 1a58471..203a557 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -240,7 +240,7 @@ isar_bootstrap() {
             debootstrap_args="$debootstrap_args --no-check-gpg"
         fi
     fi
-    E="${@bb.utils.export_proxies(d)}"
+    E="${@ isar_export_proxies(d)}"
     export IS_HOST debootstrap_args E
     sudo -E -s <<'EOSUDO'
         set -e
diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
index dc2af1a..fcbe326 100644
--- a/meta/recipes-kernel/linux/linux-custom.inc
+++ b/meta/recipes-kernel/linux/linux-custom.inc
@@ -40,7 +40,7 @@ KERNEL_LIBC_DEV_DEPLOY ?= "0"
 
 do_install_builddeps() {
 	dpkg_do_mounts
-	E="${@ bb.utils.export_proxies(d)}"
+	E="${@ isar_export_proxies(d)}"
 	sudo -E chroot ${BUILDCHROOT_DIR} \
 		apt-get update \
 			-o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \
@@ -65,7 +65,7 @@ dpkg_runbuild() {
 		cp ${WORKDIR}/${KERNEL_DEFCONFIG} ${S}/.config
 	fi
 
-	E="${@ bb.utils.export_proxies(d)}"
+	E="${@ isar_export_proxies(d)}"
 
 	export PV=${PV}
 	export KERNEL_NAME=${KERNEL_NAME_PROVIDED}
-- 
2.23.0