From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003123375800320 X-Received: by 2002:a5d:66c3:: with SMTP id k3mr28043051wrw.370.1576497015494; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:ed48:: with SMTP id u8ls6229373wro.16.gmail; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-Google-Smtp-Source: APXvYqwxzrd5jxKUhQ7zFJqaZdpNJfJYUo6HnnvaASnIJzz2ISACjYfB5VqZq4ZrrJugBFuOJO/8 X-Received: by 2002:a5d:68c5:: with SMTP id p5mr30348650wrw.193.1576497015133; Mon, 16 Dec 2019 03:50:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576497015; cv=none; d=google.com; s=arc-20160816; b=Am484S4Ok4Yitko13PeruovmiwgX4uyUxm+LEsrLBsZc07qBgtzPjCFUq709SylOv/ MHutX6c+WZm3ZpkTzDYlVAE2uNrMMW7QJ2hPTO6JBrOYzrh2XHbQ34++HALMxhEuBX5K INqmO2HuRRgBy+83KF/8Gc8CJEtqpRt15H4lLf1GWc5n8WssACx0exq+50f5x+ztXmBs zjM4Jfx+iwa2Fi0M282gPSdz+lPKSETSx61fq8ytQBF/oSAObrPG/V1aglgJhnzqei7b zUJvgR1i6l5l1y03hwd+IvEE11uj/+rR9INIxSDSQWX3MJGsGNDLWEHXZawOIXCfg8UD 4H+g== 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=Yr8UprE+I1u0UkWzSMxfEjhgKQb8VUIFKRV+ScT/sRY=; b=lF5jD5w58TDrhXB2PbavhWmnCdCuqr+f56Z+zTvA6J0uFKDdMHWP18xCXfiAYySr/o cj2FDZBkn7ILOT0gtkGvatxbRsyS10EhuwVVLkKjiBrDmajLL2eW7Y2oV/LgBzzpm5SX l+4KElvZl7zSyvnZuoy/2tpHSB1Avp0tgjPTDthXap+27HQ0Rs/b3H/OVM0Mf0leFVdx zPnupwD+2H66pdEMrDfswXh/8CI+zNS/65Rh8PEH4lpOQgdmAsxq1NO+U5qtXDBu+Yjk 3Z6qGV+zG0vKGparoWA9ww+UPNPHXL3OK5QW7rsTaFQH5Vqwsuj1vm8c1jCOyPb4F3xY 8oXQ== 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 80si536445wme.4.2019.12.16.03.50.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 03:50:15 -0800 (PST) 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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id xBGBoEkW003878 (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 xBGBoDWV009084; 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 10/25] meta: import DL_DIR debs before apt-get download steps Date: Mon, 16 Dec 2019 12:49:56 +0100 Message-Id: <20191216115011.17664-11-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: +FzMdM0wgA6x 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 e41e981..ab4b1f0 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 a6b6110..eac553c 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