From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a05:600c:224d:: with SMTP id a13mr19905wmm.53.1585230214832; Thu, 26 Mar 2020 06:43:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:61c8:: with SMTP id q8ls2823345wrv.10.gmail; Thu, 26 Mar 2020 06:43:34 -0700 (PDT) X-Google-Smtp-Source: ADFU+vv4DqDVbDDFzi3ZlbRfqn4pt+c8uqJxGcFqtOtsR1UKmPyTa8J/gf2bS5miLrEa1oYj6pQc X-Received: by 2002:a5d:630e:: with SMTP id i14mr9453338wru.260.1585230214301; Thu, 26 Mar 2020 06:43:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585230214; cv=none; d=google.com; s=arc-20160816; b=VkSRkxBh/KJbgjCC6z+yU/Av0Fgz6jPnuVNmujeVjyb5ha3BxRt5lYhzKrj//iml9i cfH8ol3UN8I1kq1XLFShwcxp0u47n2d7PGrECHh0CCGWRbbBKAEVxIsZpOQkv+xmgeED KyVIz6CSigiLobTrYrqh2hxMG/G1MT6h4zGa9XpvA5TaoMfvjqqHWxtyyqBz4aS2FzrX QC1m1MQ3zhCXtoUrnDHjcYlT1vatAAZt6SMRExPErAx1aE/6R/9cHQk6kph7UQKYS9EN tBY+moRjkGq+cKqM457r049x8q7YuSzXSxPVp6snS80oivYvHROHKyWXnsQJRRuY0uIO XEiQ== 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=APFw3n+gOPpIfL8fKKdWcgL/zu0+Xo5EH1bvLLA2MJQ=; b=I6tnquBt3zj+Pdwzdc6ozv67DPdultxV60ghS8TTvytp1rRh/7CPxf62osrVj7x18F ydcbmH+KjSMnpxQM81zQ5bXVHpCJfhMBrKWWv7gCBFE43HN16vJKuF0XWWaLrd2eKkQO 0fq8La4n3WEcETe7m+OKDgOjiloutiFm+MrJrtrslnxGpTtxe0SZqnrMlP3MkEKzO8zM vYgsLUptVLK2lV/ka+uXNoBqwCKaORWLXSuohp8BE5QWLvDxIxbeUFpa6O/d+72D8mMJ AxdVNp7LbAHjuSejeF0xz2k3l+KL8lCnM0BpQvgl/pDV0BxZBWiRcHR40ZLrXbeAkctM POcg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id d16si98712wrv.4.2020.03.26.06.43.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:43:34 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 02QDhXdM023517 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:43:33 +0100 Received: from localhost.localdomain ([167.87.11.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02QDhSBg031897; Thu, 26 Mar 2020 14:43:33 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv8 10/29] meta: import DL_DIR debs before apt-get download steps Date: Thu, 26 Mar 2020 14:43:06 +0100 Message-Id: <20200326134325.8672-11-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200326134325.8672-1-henning.schild@siemens.com> References: <20200326134325.8672-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: iVNdGyeR48LI 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 066ce1a..2858fea 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}" ] && return 0 + flock -s "${pc}".lock -c ' \ + sudo find "${pc}" -type f -iname '*\.deb' -exec \ + cp -f --no-preserve=owner -t "${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 7e908eb..afa1e19 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -12,6 +12,7 @@ GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" do_install_builddeps_append() { dpkg_do_mounts + 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 7e2c86d..585365e 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="${@ 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 ec67d94..6590ee7 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="${@ 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 706b43a..81759eb 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.24.1