From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a5d:6a88:: with SMTP id s8mr12385854wru.173.1580481004150; Fri, 31 Jan 2020 06:30:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fdc5:: with SMTP id i5ls4293416wrs.9.gmail; Fri, 31 Jan 2020 06:30:03 -0800 (PST) X-Google-Smtp-Source: APXvYqx59AMa33Xj3P0YMgZv6SfbZN8aIb9Ri52VVRpYeWI3mg0qoE1PAo9/eBjfhJqEq7gc6sbq X-Received: by 2002:adf:db41:: with SMTP id f1mr13291911wrj.392.1580481003347; Fri, 31 Jan 2020 06:30:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580481003; cv=none; d=google.com; s=arc-20160816; b=VbfXKf2v4Mn2EMRVSfw2n4GDeFpF8zuVhiZ1q6T8ZAT8Be6XX6uO5OJO9ktTuZE4XS 9Ck/WI8wH6Eino7dKcvwUhLb0QIyMjCW75zRaHoWFDChgZphDsluKJzOeL7kB1GBiKSx l/oZG/l2VLuUFXLzkqIyDZLGDcsSXA0ez5atwt91F2s1447YAoMAI/lOxl3fYHX6QXhd 6Km5KefXzx9Bjui1cnDtDgzGjYh0UEPNuZXQQ8w5NQtOJ/S2zAO73twnBFCO6QfBAERF LevhIprTQSClTBjD1x0+cUMjs3ZfYJ8OMz5tUT/uEvg/NHnHJ+jQ7QxW+WmgAFOxDFlM gATA== 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=8WXUGs6eTDV3ElYfqsfYnMAJH+zphKv8PhxuQ2K7Ymk=; b=gvRQeRFxe9b2wstUDznquS/79f2/2hAbUvl/1MUQltCIlWg9htTuUufLBKRJxUsmm+ n2BwbIzkI6+GV4ARWooYPx4sHHSPXVTC0K8eAhtklt2ywJs4qnhvTlR2GFVgN0OfzFHx xgroqQigWluPmjAhaABICECl9AN4vqFXA3/VS+Q4dLBLx8n4R3mjWPqCGQDkWwp5hStl K5V8YAQrcM3XigSp7SbFYEBKE0CZ+m/1jcaqlIU7vABorfFb5WkjDH8aqulGYw24yUoQ D6M6ejDFi+vwEp4hGi7/ESL5N5LuRMl90mtp/XqknuUSRdsMRgq4/nn9HO1q+dvsyQ+D c84g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id i15si147025wro.2.2020.01.31.06.30.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jan 2020 06:30:03 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 00VEU2xq026449 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jan 2020 15:30:02 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.68.229]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00VEU1RO030231; Fri, 31 Jan 2020 15:30:02 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Henning Schild Subject: [PATCHv4 10/26] meta: import DL_DIR debs before apt-get download steps Date: Fri, 31 Jan 2020 15:29:44 +0100 Message-Id: <20200131143000.14873-11-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200131143000.14873-1-henning.schild@siemens.com> References: <20200131143000.14873-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 9eulZH9iajQD 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 e41e9813..ab4b1f09 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 7e908eba..afa1e19b 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 7e2c86d6..585365ee 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 ec67d940..6590ee7a 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 25af4688..4e145400 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