From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:adf:f010:: with SMTP id j16mr1115067wro.317.1572282095679; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:f707:: with SMTP id v7ls177222wmh.4.gmail; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqzOCueEIJdXYb5mV0ZZh43VVCKXFWLK7gYNL4+LWHsiGDl+DIDrvB4HgIB1pCT4wg/Vucsw X-Received: by 2002:a7b:ca59:: with SMTP id m25mr283854wml.114.1572282095082; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572282095; cv=none; d=google.com; s=arc-20160816; b=DF6166fBsYJ3k561/KceFioQo49gWp6WeCF09s5eqm4aTCB+Nd2pMtsI0gvbi2KFJh i8LdzZT+Y2Z7+vFz3iaTN5iqJtUGYOOF+PcpmQG3DPY3SO0fkXqaj1VMQjqDxr3/rddf +ooNeA68d+TlFvx75fkQY4mLUH9Wys5VOWvsb9TYsVgvdbsE7BpF4cqlTw62eQfzCK4H 5A+Hk1cDzd2VCAL50W5y0/xnOxvGSW6ZRmcyH8Ite4lQ2fioYnKP/bnfIQoj0xj59OV8 quag2wg/8CD2kd82gLymAXxfWsGvEbu5y8oCBrhahVexAVky6UYlHQzfMIroizBMTdtl fmBQ== 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:cc:to:from; bh=VdEW/oA2NUGFU54SHY2oA5eaoPooxkk5BPPC4aNEt18=; b=flrP8pGakLKvZgOCHjS0iS7vVIc9T8/FdlkmSlZXqT3mETCDIrHhccu47u/r5uRC3K b/McIEclHma2iBgceO1vjeMMnV6Nwn5gB9UYvEvYryF7E3ot+zFxbtPqJWbMPGo2OKBO KlzMBVf0evCC+24gw31h0GCzTIpDD3iqGLDihD44mv0eqNhKhdvmhktG9dSwTE7K0O6k EQcmdQMUUM0H6OgHXMRFq0sLZfbPLCmT6cJKRjuhvYUCx0f/zL9QzVK1BgQwgow/IpDZ qtvAXCHn9OYXTGFQrBRC9vpgIu1xe8wiVp+UZr31JD0viP/gp3oU7BS+qIND3tJP0zO4 RLvQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id x5si33374wmk.3.2019.10.28.10.01.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Oct 2019 10:01:35 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x9SH1YHg032247 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 28 Oct 2019 18:01:34 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.244]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9SH1YPD025390; Mon, 28 Oct 2019 18:01:34 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 07/17] meta: split all apt-get invocations into download and execution Date: Mon, 28 Oct 2019 18:01:22 +0100 Message-Id: <20191028170132.28072-8-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191028170132.28072-1-henning.schild@siemens.com> References: <20191028170132.28072-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: v2cLedYyLBRt 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 3977e63..d9c3af0 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -13,6 +13,9 @@ GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" do_install_builddeps_append() { dpkg_do_mounts E="${@ bb.build.exec_func('isar_export_proxies', d)}" + 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 8b6ef21..d809cca 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="${@ bb.build.exec_func('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 7ea7557..243fa11 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..8a6db8d 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.23.0