From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003124557545472 X-Received: by 2002:a1c:a543:: with SMTP id o64mr18481335wme.73.1576497015325; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:ed48:: with SMTP id u8ls6229368wro.16.gmail; Mon, 16 Dec 2019 03:50:14 -0800 (PST) X-Google-Smtp-Source: APXvYqz4SVh6H1952gna/hsDYpaX0s6eMv4+jBH45NGvKnIx+ZdPsCkW7Z4Ic6CGG8nvbMbKmahy X-Received: by 2002:adf:dc8d:: with SMTP id r13mr31038780wrj.357.1576497014736; Mon, 16 Dec 2019 03:50:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576497014; cv=none; d=google.com; s=arc-20160816; b=X2bRLP/jBNK326bOsgD3duUfC1jaBTJF9okDnBn85UqeN6TSBZzMqufKszLb2ZkfVM JC6uXWGidTS6PrDIIhblUqRPdjl3+Kr4Qx0syrXPcALAToG3WlTcR6OlFCa3s3bpJmTw m5JN9GxK64Mi+thNDlq/WL3+RbTAflMOJCZ0kDiYvJCDXcA/voal5ALhDIVS3ONCILnv MLtAGpYCe1hSKkqLZ5tIkA2b2gyoODg1fIS89Lb3j+x06b/97Odd6s2M+H3sWloN75jQ 8SOeodhCOht9fkEmjrrWl7KdWrZplwiKyV1LSpMYN6NrTIreSG6UX2C/oRR/Uw8nxp2P PAzA== 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=gJPsPrBFzNx0d1mbJ79nApM5gEBV3D8jEjtm6GQLn1g=; b=RI7G2h5GeQpnAy2ZfJpW2FME2JrS/6u0Eg45ooXIq0yaQ1+yeWlCFUioMO0wytlfSO q3mKUFXU6oCclJ2be1ExUSYfJOM4Hied+LZ99TDR92XmJz2cOcDehUhbHPzgBybLFflr 8IXMzQuZ8hKu2J8Q00ekiqtWPU/MAjItROMVciMNE1FUy7xzO2L3pQP6M3Hxx3GHe5rQ o7+XoGbr8PYw2owHjFr6p08Kk5GQLAwN5oMAz3Q10UD5w1B6F1G/+wA01NmotDfobZQ8 lA/h+IIcwkz4xF+bFK/kxRJ3yzXu693odnyi47L9ViY9Y3jxmXh7p7ua5v6qZKxTQGlN Cx0w== 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 m12si701712wrq.1.2019.12.16.03.50.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 03:50:14 -0800 (PST) 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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id xBGBoEGM005651 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Dec 2019 12:50:14 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.101]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xBGBoDWT009084; Mon, 16 Dec 2019 12:50:14 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Baurzhan Ismagulov , chombourger@gmail.com, Henning Schild Subject: [PATCHv2 08/25] meta: split all apt-get invocations into download and execution Date: Mon, 16 Dec 2019 12:49:54 +0100 Message-Id: <20191216115011.17664-9-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216115011.17664-1-henning.schild@siemens.com> References: <20191216115011.17664-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: qP899hRUK3DL 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..0f11d78 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.24.1