From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:adf:eec6:: with SMTP id a6mr5434242wrp.96.1583877404208; Tue, 10 Mar 2020 14:56:44 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:4b06:: with SMTP id y6ls1322093wma.3.canary-gmail; Tue, 10 Mar 2020 14:56:43 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsxrgmwb+9zsG3nIKJ86Qje67KNY/s4M5Nn/jckUdLvI5515m5RDd3CbCfk2My0OrB3ivcZ X-Received: by 2002:a1c:7901:: with SMTP id l1mr4086181wme.188.1583877403642; Tue, 10 Mar 2020 14:56:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583877403; cv=none; d=google.com; s=arc-20160816; b=paPk9YJVYnCMsbX5OdZSmY6lV9/JYEKTlh6t+7W9n4AAWS1734Durb8FRJ1sEFNiK7 hLBz3luZmTQOjvjeyRxSRmy2qwpeq7BFHalNbdaHmMd+DltiYjmTr77AGvwaMcQeVtc0 ZzUXKAklg0kkKXgAEzFkGVJTxiJ1XR4OlxYt91RDIFfdL2IVVEScGv4m878b2mI1MUY4 r38iDIjajQr9NwjVg2w94b2GtVn1ysu2yQDv/5xV+o9BsFdEDtfBWmhD39JtSS/bNNFZ hlOMZtCrCscZgNJyuVWM2BHWIsOrs/d6w/1PHQzVXfSxlLykVaxliirVgxvIs2Pk0jb5 57sQ== 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=UYTdsNzQ7IBb6b6cmbvrko9+BEC7mBU1QkZz4uNco5U=; b=O+x6oj5GfXpF4BwgRS45Axnl8vEZPoDxBU9H08xWZ+mkxd35c9Hje9+uo8TGM5QxYy 5F0/8V1H06UGVycqpgEfEnKPNmd1r6qZGFE8X1YOs4pfRIeqSPVPJ00DPeGbzHUU7w5b b8dlTMP52dLiciXwT+oP2KbSWS76fyMUqUsbI6Qcr4jHGTjOW1K12CnTkwwrj5peX7Sb DDuA2fJwrM8sA2ZAvwnPR4+/7w+76iltR26hvpuMpUNMP+wSMDsrT7aB9YEPu1+izZV4 JE4DgvWLfJK7EE4fhCWSDPEN/pW7Hm4E0sKmxSbzmqRmLdfkHr8qQXfGS62qeTcchl4a 4fPA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id h15si244581wml.4.2020.03.10.14.56.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2020 14:56:43 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 02ALugUB011907 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Mar 2020 22:56:42 +0100 Received: from localhost.localdomain ([139.22.36.172]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02ALub5s026985; Tue, 10 Mar 2020 22:56:42 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv5 10/29] meta: import DL_DIR debs before apt-get download steps Date: Tue, 10 Mar 2020 22:56:12 +0100 Message-Id: <20200310215631.24859-11-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200310215631.24859-1-henning.schild@siemens.com> References: <20200310215631.24859-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: iHpqT2kOJlUE 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 066ce1a3..2858fea2 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 706b43a7..81759ebc 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