From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a7b:c4cb:: with SMTP id g11mr6023975wmk.83.1583364526440; Wed, 04 Mar 2020 15:28:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a444:: with SMTP id n65ls56245wme.3.canary-gmail; Wed, 04 Mar 2020 15:28:45 -0800 (PST) X-Google-Smtp-Source: ADFU+vuo28kB3YbAWvXYYpT3G3Kn3KxZimCAMIvaA3Yvbp2A0ILRv5iqZN0C4pkyLZzRLLZl5Gqi X-Received: by 2002:a1c:4b0d:: with SMTP id y13mr5909701wma.4.1583364525802; Wed, 04 Mar 2020 15:28:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583364525; cv=none; d=google.com; s=arc-20160816; b=FIPMM7Dho83AqhIE6m0CDIV8mT87sa7p1fDQ6DCY/M51tR9HaPfxmWlXAzK4wEPxg1 33bFcjpD/nxOWsOhJmUeu4ySYYCo1RoLNhkfNmhebs9IdrjEE2anjs3ZiNqCPNNTZe4/ xkhRmHbbCnDvN68swtWj4pwyLNpFM2BdXWOpJbj1GzQDMbonltQPOFLITEvRPXKpLuP9 ZzwPh54Q3SESCiZ/nP5gny4AzBMuStNtTv3Z3usVFEaeJvDLGlS3xuLNcoDHlWr8IVeY 6RWzZqUuCrea6PhyLdqLxxmt5FpuKZODVDXDsyBHn3/chNu/OSyp89HuOIzqql2h7AX8 sXDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=1T/ZU1T2jDSSUGZfZdDSeZNsN8VY87ccgcJzAHSK0II=; b=hq/Q4KX6zJ733gvyF2iIGl5BmRbPHry/+2rTxCK6CFpL2lrTIEIycaBm8rLqIcVb4w H9BG2qx7dcew84Rggivc+GhU4gTCszdtzCWcbboKCX1UyRG3/hsdk7erSFHcDKNSTd6S +slZWWz2oVcOWYErgukfyS0STtMGPTKsd3A5Q6zrclXhTz3mbV9QFVqZhGL8zxz2O2lA ESoySxArJYrSftPUjxDOSHBJzohaVTLPpVFlEA3z2fPG4+l3369LWvGJEneqtNX+BZ4T 6YIXN4j/Gq2ReXXr75LNgdrp6NZRi2D3xMMEX6znip0AO4IQK2nyeCgAHs6AFFwFwWth dl2w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) smtp.mailfrom=ibr@radix50.net Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id s203si170011wme.1.2020.03.04.15.28.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Mar 2020 15:28:45 -0800 (PST) Received-SPF: neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) smtp.mailfrom=ibr@radix50.net Received: from yssyq.m.ilbers.de (dslb-084-061-174-236.084.061.pools.vodafone-ip.de [84.61.174.236]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 024NSiGp004583 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 5 Mar 2020 00:28:45 +0100 Received: from yssyq.m.ilbers.de (localhost [127.0.0.1]) by yssyq.m.ilbers.de (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTPS id 024NSdlE016612 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Thu, 5 Mar 2020 00:28:39 +0100 Received: (from ibr@localhost) by yssyq.m.ilbers.de (8.15.2/8.15.2/Submit) id 024NSd5u016611 for isar-users@googlegroups.com; Thu, 5 Mar 2020 00:28:39 +0100 From: Baurzhan Ismagulov To: isar-users@googlegroups.com Subject: [PATCH v5 08/26] meta: split all apt-get invocations into download and execution Date: Thu, 5 Mar 2020 00:28:39 +0100 Message-Id: <20200304232839.16569-1-ibr@radix50.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200304232537.rdhqt4udjhyadz25@yssyq.m.ilbers.de> References: <20200304232537.rdhqt4udjhyadz25@yssyq.m.ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED 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: yy5I1LIwZctm From: Henning Schild This commit does not contain a functional change. We just split all calls of "apt-get" into a download and an execution phase, so we can later copy out the downloaded files. Signed-off-by: Henning Schild --- meta/classes/dpkg-gbp.bbclass | 3 ++ meta/classes/dpkg.bbclass | 5 ++- meta/classes/image-tools-extension.bbclass | 5 +++ .../buildchroot/files/deps.sh | 37 +++++++++++-------- 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index 0533a52..2afe9db 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -12,6 +12,9 @@ GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" do_install_builddeps_append() { dpkg_do_mounts + sudo -E chroot ${BUILDCHROOT_DIR} \ + apt-get install -y -o Debug::pkgProblemResolver=yes \ + --no-install-recommends --download-only ${GBP_DEPENDS} 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 180a3a8..b26c645 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -7,7 +7,10 @@ inherit dpkg-base do_install_builddeps() { dpkg_do_mounts E="${@ isar_export_proxies(d)}" - sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh ${PP}/${PPS} ${DISTRO_ARCH} + sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ + ${PP}/${PPS} ${DISTRO_ARCH} --download-only + sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ + ${PP}/${PPS} ${DISTRO_ARCH} dpkg_undo_mounts } diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index d4f216d..b8531cb 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -30,6 +30,11 @@ do_install_imager_deps() { -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ -o Dir::Etc::SourceParts="-" \ -o APT::Get::List-Cleanup="0" + apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ + --allow-unauthenticated --allow-downgrades --download-only install \ + ${IMAGER_INSTALL}' + + sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ --allow-unauthenticated --allow-downgrades install \ ${IMAGER_INSTALL}' diff --git a/meta/recipes-devtools/buildchroot/files/deps.sh b/meta/recipes-devtools/buildchroot/files/deps.sh index 002085b..6048305 100644 --- a/meta/recipes-devtools/buildchroot/files/deps.sh +++ b/meta/recipes-devtools/buildchroot/files/deps.sh @@ -12,27 +12,34 @@ source /isar/common.sh # 2) we add -y to go non-interactive # 3) downgrades shall be allowed in case a package recipe was changed install_cmd="apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends \ - -y --allow-downgrades" + -y --allow-downgrades $3" -# Make sure that we have latest isar-apt content. -# Options meaning: -# Dir::Etc::SourceList - specifies which source to be used -# Dir::Etc::SourceParts - disables looking for the other sources -# APT::Get::List-Cleanup - do not erase obsolete packages list for -# upstream in '/var/lib/apt/lists' -apt-get update \ - -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ - -o Dir::Etc::SourceParts="-" \ - -o APT::Get::List-Cleanup="0" +if [ "$3" != "--download-only" ]; then + # Make sure that we have latest isar-apt content. + # Options meaning: + # Dir::Etc::SourceList - specifies which source to be used + # Dir::Etc::SourceParts - disables looking for the other sources + # APT::Get::List-Cleanup - do not erase obsolete packages list for + # upstream in '/var/lib/apt/lists' + apt-get update \ + -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ + -o Dir::Etc::SourceParts="-" \ + -o APT::Get::List-Cleanup="0" +fi # Do not set an architecture when building only 'all' (generic) packages. # This can avoid unneeded cross-build issues. if ! grep "^Architecture:" debian/control | grep -qv "all"; then - set_arch="" + set_arch="" fi # Install all build deps -mk-build-deps $set_arch -t "${install_cmd}" -i -r debian/control +if [ "$3" = "--download-only" ]; then + mk-build-deps $set_arch -t "${install_cmd}" -i -r debian/control 2>&1 \ + | grep "mk-build-deps: Unable to install all build-dep packages" +else + mk-build-deps $set_arch -t "${install_cmd}" -i -r debian/control -# Upgrade any already installed packages in case we are partially rebuilding -apt-get upgrade -y --allow-downgrades + # Upgrade any already installed packages in case we are partially rebuilding + apt-get upgrade -y --allow-downgrades +fi -- 2.20.1