From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:a50:9555:: with SMTP id v21mr20249923eda.90.1572282096039; Mon, 28 Oct 2019 10:01:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d80b:: with SMTP id v11ls577672edq.0.gmail; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIcW7iDgSfijE+dNoowVzNpx68549GIqX/62lI1ff5CaVkOpfBuuudqMmc8tO0vbPAZvY9 X-Received: by 2002:aa7:cd5b:: with SMTP id v27mr1250179edw.174.1572282095565; 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=KXlfkd69uwW1j4mUFNZoTKEeikRkyMOdpT6/Z3PUF0Vb021zEKR/h9lpuNI8Ds706D 1JifTi4KnO93Q67yM/360bK4IWgtirOGerlec37wo9cqpEDh56uAsTl9J/t4I1clCi6x 3aUQgLEcXPWphZP+lJMLkBWt9IUW7ehserEd1vlzd32e0vHZDgnNc6ozUmYZ91l16HCu 5NqUmh+e25jPBv13aJAT6XzhJjTVfPde6KtpUe8+BDx9zM9I1o79LPChx4KWFimWGImF 89yLflfUsTz5Eo4xjyRA7DjQqDlHARIngI0Ojd8yv2yZX7QQJLjixIsYpquvtJru6gRd IrkA== 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=wewDFUqseH7NR+o+AzzmMMeQFiDsEkrI7DCQrnTn18k=; b=btAIYQcECUzJC5Pccgt5NEs/dXLA27JSPAP8m5DiBz2O7ZGhm/tA2ktrCdzkQ26s0P D2Y+870WJ9mDmoBchfl7qkyPsN9+XfKFkWjGWAaBH1m6H6R7ibP2DI6vdvPWxmO25CEA D5Cw1OEdWUc7A6BxF01NaFcxaY5Pkv1fE5mk5RiEuYsDbidMGIou5zZynn0IDKz05ZbZ IK11gtF61A5sFeYxDuPKWcoTmKHCOhFExp4t0IL1b9zwz2Ijb3EivutmMYc5DsOM7+h+ 0XX8pU4ORnKq2FQG88QijfHK3PiMMZLTMuB/sS707pmW/S1eojl/mZy6OzfthvAIWJ9q 5kjA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id q17si953371edi.1.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 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x9SH1Zi5007997 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 28 Oct 2019 18:01:35 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.244]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9SH1YPF025390; Mon, 28 Oct 2019 18:01:34 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 09/17] meta: import DL_DIR debs before apt-get download steps Date: Mon, 28 Oct 2019 18:01:24 +0100 Message-Id: <20191028170132.28072-10-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: oP26ZMPHZ5hG From: Henning Schild If we ever downloaded a file there is no need to do that again. We can not only use that DL_DIR to later construct a repository but also to speed up our rebuilds. Signed-off-by: Henning Schild --- meta/classes/deb-dl-dir.bbclass | 10 ++++++++++ meta/classes/dpkg-gbp.bbclass | 1 + meta/classes/dpkg.bbclass | 1 + meta/classes/image-tools-extension.bbclass | 1 + meta/classes/rootfs.bbclass | 6 ++++++ 5 files changed, 19 insertions(+) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index e58df7a..b137eb9 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -3,6 +3,16 @@ # # SPDX-License-Identifier: MIT +deb_dl_dir_import() { + export pc="${DEBDIR}/${DISTRO}" + export rootfs="${1}" + [ ! -d "${pc}" ] && exit 0 + flock -s "${pc}".lock -c ' \ + sudo find "${pc}" -type f -iname '*\.deb' -exec \ + cp -f '{}' "${rootfs}"/var/cache/apt/archives/ \; + ' +} + deb_dl_dir_export() { export pc="${DEBDIR}/${DISTRO}" export rootfs="${1}" diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index 9e6945b..be0769c 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -13,6 +13,7 @@ GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" do_install_builddeps_append() { dpkg_do_mounts E="${@ bb.build.exec_func('isar_export_proxies', d)}" + deb_dl_dir_import "${BUILDCHROOT_DIR}" sudo -E chroot ${BUILDCHROOT_DIR} \ apt-get install -y -o Debug::pkgProblemResolver=yes \ --no-install-recommends --download-only ${GBP_DEPENDS} diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index b6844e9..9e10ad8 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -7,6 +7,7 @@ inherit dpkg-base do_install_builddeps() { dpkg_do_mounts E="${@ bb.build.exec_func('isar_export_proxies', d)}" + deb_dl_dir_import "${BUILDCHROOT_DIR}" sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ ${PP}/${PPS} ${DISTRO_ARCH} --download-only deb_dl_dir_export "${BUILDCHROOT_DIR}" diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 3906585..08b426d 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -25,6 +25,7 @@ do_install_imager_deps() { buildchroot_do_mounts E="${@ bb.build.exec_func('isar_export_proxies', d)}" + deb_dl_dir_import ${BUILDCHROOT_DIR} sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ apt-get update \ -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 841aa89..845304c 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -113,6 +113,12 @@ rootfs_install_resolvconf() { fi } +ROOTFS_INSTALL_COMMAND += "rootfs_import_package_cache" +rootfs_import_package_cache[weight] = "5" +rootfs_import_package_cache() { + deb_dl_dir_import ${ROOTFSDIR} +} + ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_download" rootfs_install_pkgs_download[weight] = "600" rootfs_install_pkgs_download[isar-apt-lock] = "release-after" -- 2.23.0