From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003123014041600 X-Received: by 2002:a5d:4ed0:: with SMTP id s16mr30085248wrv.144.1580226183423; Tue, 28 Jan 2020 07:43:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:247:: with SMTP id 7ls1814041wmj.3.canary-gmail; Tue, 28 Jan 2020 07:43:02 -0800 (PST) X-Google-Smtp-Source: APXvYqx4/JRIVseWMRUCme3b1V+ZerjSvQs2voeBA0IevQJpBvkgZILFi2c1g+WotfwRlkh+rMBJ X-Received: by 2002:a1c:1c4:: with SMTP id 187mr5864145wmb.77.1580226182640; Tue, 28 Jan 2020 07:43:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580226182; cv=none; d=google.com; s=arc-20160816; b=0KmmRBtKDRmmGztrdSGsBsUacmCg0KKginDooEgPfkbmiipnw/O9JssSYIZq7q/KIh l98PsmTJG8KUMNcVuSG2tmgFyXu82Vvid79NF/qvwdJYDtqybYuXrzfQgXVHpsFHDaBS vu2MQIWr2fY7cnEF08Y5IkI45TmwJiNubZjxgYDvFbvB2BUHFOg9cIcjcKuQPn7sHBdj Ab09f+EL/MNfkwrwnZop65rYsvuSzpb4qlKZDraJAxDKy65uACgiO3u6bqlfnWndvVvd Z6jM5Ev+xkZ0gAR1TO5fygVbRoMBPc1XRdLMNGrRPA292qyHDz2O96cB9GNPBmbjgy3d zWAQ== 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 :dkim-signature; bh=1oByK/dEmY6X1hUWGKqEm6nedXavQA5YKdUDU4KN4co=; b=JJPNVCkIn6XPiOXR0OjOg1rJF2DGmYnBPNIdiUQEMR6Moxda3t49l99E4pZa3OAB3p eOb+TsWg1dqrp80ubvbNzQrqEwdNfA0CYK4KvQeuNOoEBVIQcVVQ1TnodShKMls+XQ32 K6Ulo+Nl1qWHhFV5toyOOsds7lW3NDgv48wdKCDJ9tfQs0iSR2lo7UY2xnbVXK5Jzitt eEr1ojXA0+W+f/faTpBVdAY6xlnLGvc1Vo4ucj2EHj4r69akxM2/iCGZsVJBgrIZQmIR JFeboR/gm/JK+W5wl8bFOdE6es1hd+NRFH8O8L5I/Vw/oc7bGi6n0TrRRSliYtLu0FLo 0Uog== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=s0QcHbde; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::442 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com. [2a00:1450:4864:20::442]) by gmr-mx.google.com with ESMTPS id u9si702806wri.3.2020.01.28.07.43.02 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Jan 2020 07:43:02 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::442 as permitted sender) client-ip=2a00:1450:4864:20::442; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=s0QcHbde; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::442 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wr1-x442.google.com with SMTP id z3so16578137wru.3 for ; Tue, 28 Jan 2020 07:43:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1oByK/dEmY6X1hUWGKqEm6nedXavQA5YKdUDU4KN4co=; b=s0QcHbdeR/E4aUmVciL9f+bedkL/0fDKVssDarHzqX9qfd6y/smHobPwQuX4LCD+c2 R01T0KBTmC+rd+CuAKl8tn18loUzYxazHdonfeocBDfh8C2gfyLkeRELPl3Fai7erPze Wc/WTnhgW+naJP521Cdj6uVZp8B4sVznUYAjBXISmPCP5TPqh62bhEj2fmobRbOL1c/8 4h2OHb4iFtdwI+9MvC54FxwsoBzgQmgl24ESL4vAAgge+JcYChdLKf0lu4xMNOugEsZ6 RrqhhUTokRmUiONKcwMqP6ZgFEeNc/8GDoWgAh0Vz304dKwLIRTwLR2pDkCaQokO9NTf nlyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1oByK/dEmY6X1hUWGKqEm6nedXavQA5YKdUDU4KN4co=; b=AVVv0AnS+Kae+gLf4y7IeRahUwt0N72PBS4UD/8J32kA8aIvOe+uvZMMquK4TBGeey 0YNc4S+zGlVI63I9pHvCNBspXl2CxZUlUhuFfdrt/Ukl6z95nRt+v2LoJNVc/vde+oO6 v2k+oZ7gvVnBa4sbo8JlnRfP/Zp+LfLSjY7UNCPAKDR+n9r01+km/atqSEmujZLLL624 XJ6T55gTxoKIzU7ziGtVCe1nQLb7ur9ZpAk3AJkmNEiZ0Uh+0o30FyhyIGR/Wg+5rR9Y cJ6F878bs7UuqNkUGtyVkc1RANxvwWg5WW+KbAOoF2jT3R8aAwSLkycDmpc7nWHWPs8d XieQ== X-Gm-Message-State: APjAAAXOsvHPvT5n5E8xs1P7k4k7rjUTHCBjuv9kUC9bG8RAXNrUtnqM vZ2naC/u9SqPzCyD+FuDMiLssTS64uA= X-Received: by 2002:a5d:46c1:: with SMTP id g1mr29118135wrs.200.1580226182132; Tue, 28 Jan 2020 07:43:02 -0800 (PST) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id u8sm3601200wmm.15.2020.01.28.07.43.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 07:43:01 -0800 (PST) From: Vijai Kumar K To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v3 08/26] meta: split all apt-get invocations into download and execution Date: Tue, 28 Jan 2020 21:11:55 +0530 Message-Id: <20200128154213.22353-9-vijaikumar.kanagarajan@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200128154213.22353-1-vijaikumar.kanagarajan@gmail.com> References: <20200128154312.337e61f6@md1za8fc.ad001.siemens.net> <20200128154213.22353-1-vijaikumar.kanagarajan@gmail.com> X-TUID: HqP0Y2eJJCuf 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.17.1