From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7111687409920638976 X-Received: by 2002:a67:e8c1:0:b0:354:2823:74d3 with SMTP id y1-20020a67e8c1000000b00354282374d3mr4758108vsn.79.1655818791932; Tue, 21 Jun 2022 06:39:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1f:734b:0:b0:36b:ff12:1866 with SMTP id o72-20020a1f734b000000b0036bff121866ls494159vkc.11.gmail; Tue, 21 Jun 2022 06:39:51 -0700 (PDT) X-Google-Smtp-Source: AGRyM1udu0CJR8PnIA8Ex0LR+QOVdYiXs90t4owx+CtcBmQpZXnJI0Jkg8MQdZYon8bwzY+0a0fI X-Received: by 2002:a1f:b654:0:b0:35e:eb1:793d with SMTP id g81-20020a1fb654000000b0035e0eb1793dmr11570039vkf.37.1655818791438; Tue, 21 Jun 2022 06:39:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655818791; cv=none; d=google.com; s=arc-20160816; b=D6f6vMe7//2qVLBPLU7AEZe6Z9YtNPDCiuFF70X0E1v8N7isAc/zte610cU3k13kQ/ 6VjSFuWUM2scSOFmalTumWErd3qvyLtOvVISOwAwEpie+Hx52qk6Sw+eBesFfO9hA/z6 R7YLg3eIEpmF/2FNdQBAZ9BGcnZr1bYPKVf6lN+dYqIEJ4gqtQQyTtXcBvY6V1V07ro0 5P0sJ5njZ4emfmHiIkceee4w6L/Kgcvd9ldLEtu5/BvEJ6rj9ClaD+HxWk2roSLSIQMl DS+bw2Rjli6fMYcCszw02XbSTCJMfoM/TnEhhZW8lr+X27IznBh6dXR4QDWAcWG3Qlv2 qvEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=zxUa+l+JU0MYotSJeK0aOIrVqVlWTAZUu5tUDWpt5cA=; b=efmnq8/oDATkeaOsoQrew5GeAojsD4v+7qsTNXH8laFBHYzC2UFjgBScxv5MdS2D6g K8vEW+W/TVbQFFqsYkRgOiJ8XwI1UjddTyeQf7eVl546z8N/T6H+Rv+XjC0CSmNL0DRf r2VvM5hD/h2k9QSZ3HNRKgwAJU9sYq8XexIkx9II7EwHqcOB9XRflbsK1GxXolgKKxZY eGXvPpPxviMyTeQquTL5RHEe3gvu7elsgNxKlnjSfDRUBIKFXMOwDt1oBwl1v1Kvgh7s lvBbXK5I/p/Q8sP19JRdIRybxBflTmqTmTiIbSYhO+5WGaESGdmGYjlLfcMHJOwXqALW R04w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ay14-20020a056130030e00b0037f13500ccdsi544047uab.0.2022.06.21.06.39.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jun 2022 06:39:51 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-222-67-120-178.brest.dynamic.pppoe.byfly.by [178.120.67.222]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 25LDd50m031134 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Jun 2022 15:39:45 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Anton Mikanovich Subject: [PATCH v1 10/11] meta: mark network access required tasks Date: Tue, 21 Jun 2022 16:38:55 +0300 Message-Id: <20220621133856.4673-11-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220621133856.4673-1-amikan@ilbers.de> References: <20220621133856.4673-1-amikan@ilbers.de> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: QI9P+D0MtLSS Network access from tasks is now disabled by default. This means that tasks accessing the network need to be marked as such with the network flag. Signed-off-by: Anton Mikanovich --- meta/classes/base.bbclass | 1 + meta/classes/dpkg-base.bbclass | 1 + meta/classes/dpkg.bbclass | 1 + meta/classes/image-locales-extension.bbclass | 2 ++ meta/classes/image-tools-extension.bbclass | 1 + meta/classes/rootfs.bbclass | 3 +++ meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 1 + 7 files changed, 10 insertions(+) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 4ec2c81..d62997a 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -178,6 +178,7 @@ def isar_export_ccache(d): do_fetch[dirs] = "${DL_DIR}" do_fetch[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}" do_fetch[vardeps] += "SRCREV" +do_fetch[network] = "1" # Fetch package from the source link python do_fetch() { diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index be85134..05c0d27 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -118,6 +118,7 @@ do_apt_fetch() { addtask apt_fetch do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" +do_apt_fetch[network] = "1" # Add dependency from the correct buildchroot: host or target do_apt_fetch[depends] += "${BUILDCHROOT_DEP}" diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index af83353..d73cdac 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -29,6 +29,7 @@ addtask install_builddeps after do_prepare_build before do_dpkg_build do_install_builddeps[depends] += "${BUILDCHROOT_DEP} isar-apt:do_cache_config" # apt and reprepro may not run in parallel, acquire the Isar lock do_install_builddeps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" +do_install_builddeps[network] = "1" addtask devshell after do_install_builddeps diff --git a/meta/classes/image-locales-extension.bbclass b/meta/classes/image-locales-extension.bbclass index 25af540..e4f41a6 100644 --- a/meta/classes/image-locales-extension.bbclass +++ b/meta/classes/image-locales-extension.bbclass @@ -27,6 +27,7 @@ def get_nopurge(d): ROOTFS_INSTALL_COMMAND_BEFORE_EXPORT += "image_install_localepurge_download" image_install_localepurge_download[weight] = "40" +image_install_localepurge_download[network] = "1" image_install_localepurge_download() { sudo -E chroot '${ROOTFSDIR}' \ /usr/bin/apt-get ${ROOTFS_APT_ARGS} --download-only localepurge @@ -34,6 +35,7 @@ image_install_localepurge_download() { ROOTFS_INSTALL_COMMAND += "image_install_localepurge_install" image_install_localepurge_install[weight] = "700" +image_install_localepurge_install[network] = "1" image_install_localepurge_install() { # Generate locale and localepurge configuration: diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index b996813..c979c3c 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -17,6 +17,7 @@ DEPENDS += "${IMAGER_BUILD_DEPS}" do_install_imager_deps[depends] = "${BUILDCHROOT_DEP} isar-apt:do_cache_config" do_install_imager_deps[deptask] = "do_deploy_deb" do_install_imager_deps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" +do_install_imager_deps[network] = "1" do_install_imager_deps() { if [ -z "${@d.getVar("IMAGER_INSTALL", True).strip()}" ]; then exit diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index bf8b6db..6c6c808 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -118,6 +118,7 @@ EOSUDO ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_update" rootfs_install_pkgs_update[weight] = "5" rootfs_install_pkgs_update[isar-apt-lock] = "acquire-before" +rootfs_install_pkgs_update[network] = "1" rootfs_install_pkgs_update() { sudo -E chroot '${ROOTFSDIR}' /usr/bin/apt-get update \ -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ @@ -143,6 +144,7 @@ rootfs_import_package_cache() { ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_download" rootfs_install_pkgs_download[weight] = "600" rootfs_install_pkgs_download[isar-apt-lock] = "release-after" +rootfs_install_pkgs_download[network] = "1" rootfs_install_pkgs_download() { sudo -E chroot '${ROOTFSDIR}' \ /usr/bin/apt-get ${ROOTFS_APT_ARGS} --download-only ${ROOTFS_PACKAGES} @@ -166,6 +168,7 @@ rootfs_install_clean_files() { ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_install" rootfs_install_pkgs_install[weight] = "8000" +rootfs_install_pkgs_install[network] = "1" rootfs_install_pkgs_install() { sudo -E chroot "${ROOTFSDIR}" \ /usr/bin/apt-get ${ROOTFS_APT_ARGS} ${ROOTFS_PACKAGES} diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index a453b36..4320583 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -277,6 +277,7 @@ do_bootstrap[vardeps] += " \ " do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}" do_bootstrap[depends] = "base-apt:do_cache isar-apt:do_cache_config" +do_bootstrap[network] = "1" do_bootstrap() { if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then -- 2.17.1