From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a2e:330e:: with SMTP id d14mr7938215ljc.72.1584779522449; Sat, 21 Mar 2020 01:32:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:964b:: with SMTP id z11ls78364ljh.11.gmail; Sat, 21 Mar 2020 01:32:01 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtC89MJXJWliLE61alPWtNvQZ5XyMc9v/iy+slPHfnLWpNb156btVvMT1Du2+fxU0rfvT+s X-Received: by 2002:a2e:b602:: with SMTP id r2mr8305725ljn.45.1584779521658; Sat, 21 Mar 2020 01:32:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584779521; cv=none; d=google.com; s=arc-20160816; b=07SqeFOt+nPQ5mgOZvDV8EqqkFuFqbr215/qYgUKnlLJGR72CvIPRB5ZQwJbE4n/4A Qrsqaqqskf5Kqv5SJ5Dy1h8cegRyyvluIQTMjE9DrLfHmWFs2tThF/Xut9UMGKC8CibM Mm1dbYBcS3kfMzaYowOXsze4VdHm2++iGhypTbM2pD6/2rJlYXwtNSZBE2whw3ZpjZ8E QcZkKPoeoP6u8LT0/yGOebnXfSiKvGN4Eg74xIyXtRaE0YpliMiPn9/1eRgfgAOJIbLy Rg323rElO4yqDfAThoWBgnLm3mqef09/3i1N3z9txABOVKJm9AX5oP5VV47WUDMLXAQl a3RA== 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=dxJzvxzDjqWEQkA7dxpCqbgnzHHNKeNlH0q6s32L2gc=; b=SjMhJEqnBfexzT58tLeMS5NlHLEPoc2e2iCgRo0vyrlv4smYA/HOIMreXVIJjVy7+b bCanKLLDYzR2Gnq7eB5EbiYkxBKsrcv5nYkBUhLEO4HF7Ie01bYDjXS+rCLGdMs0Dwxi E0sgCB9xBt4HpM/5BM6Hu5PS4I0P3X7xESjSOnGlJETooQ9qHpXBrMFJsJvQ4vA15Iwm GTHjBWkYlXkS+o/WGoPzrIkPZJAj6fRBdRKEognfr25kg9tf0DNfoLwRo4QyD7VXSVAB cW8T+jSDbXEndPPQSb3ihBg0pTRfPjVQBHRNBqe4A5bqh21ahGgGtR6mQdpRg2tEGAU/ Cqlw== 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 m11si317908ljj.2.2020.03.21.01.32.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 01:32:01 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 02L8W0ia001296 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 21 Mar 2020 09:32:00 +0100 Received: from localhost.localdomain ([139.22.32.253]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02L8VuGM021533; Sat, 21 Mar 2020 09:32:00 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv7 08/29] meta: split all apt-get invocations into download and execution Date: Sat, 21 Mar 2020 09:31:27 +0100 Message-Id: <20200321083148.26160-9-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200321083148.26160-1-henning.schild@siemens.com> References: <20200321083148.26160-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: jkMbqAVwmt4+ 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 0533a52f..2afe9db4 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 180a3a89..b26c6456 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 d4f216da..b8531cb4 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 002085b1..6048305a 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