From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:ac2:523c:: with SMTP id i28mr8532921lfl.165.1572282096396; Mon, 28 Oct 2019 10:01:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4559:: with SMTP id j25ls1022665lfm.1.gmail; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqzEYknW2M3//I27xv1K0gTtv+j4QodOdOgNAu+ENRQSxDShWUDel37fHPoPgAIETPdMg52i X-Received: by 2002:ac2:4304:: with SMTP id l4mr12466473lfh.130.1572282095729; 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=kCTR1MtotK/Me4pK2xFFIbp56/Oljmqr5N21PDIRYzu04DIvMnq2xUYkft9bfksNwA 35UF4VeIErOracByZqqoYG87/sPBhegxK25EgBygu6CpBrRJCh9RKZWQ6c+BqbvVL2k6 DieAS7XCSszPSflZKrpR9driifP1QCixSYrqJfHTgcQN3QhOGV0YwF4gOsX5FjcOyGrm OpOsODvv/kPouHaocQmaBfGHgq2piaNnX/l+hu38Ogo/vTY8cq+1R2yqLaJjAmHCYZUp Z8yRilC/WVP4WEEhpRCQ41L7s6RRn49pBKrgwhBwsk6xaVCMap74iY0O+qJd+fLIjP4L MWeg== 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=QKigBeTA6LggJSLSQ41fEtpJgI9ZdrlZliT8WK638sY=; b=LJvZ5RsiQtBK4qQ29vSpqGY9GZ8HcXDIrh1kGkvb3nsR3B7+1tgiJHM5bLVV5C2BMK fPyJSF7t1kLwEigy+JSgUTjm3cmvvGo6Uz/8Z3GZ4sbtH2z9JMZWIwqfgNdMW9soVleJ caLzooS7wdmkcGKO5p5PHqf8iuMGA18vDkogJQ0aTf2EM95dCUclVKBsaNu6nu1xy1CR i5fk30UBTOw9SvDNvE/Cyb/VIYy5xUYHZ1I6oTYIcB3m/Clpfv3+o2vunZJVsv2/w7Rr otp55BvLSRGOgjUb9hJJN043rHXnblzTPMsWqUslLUvVy+ZI22Y6Efo9W7eyPdku8jTQ TAeA== 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 r71si479593lff.5.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 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 x9SH1YkY014517 (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 x9SH1YPE025390; Mon, 28 Oct 2019 18:01:34 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 08/17] meta: create DL_DIR support for all apt-get downloaded .debs Date: Mon, 28 Oct 2019 18:01:23 +0100 Message-Id: <20191028170132.28072-9-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: MJxZhakym+aC From: Henning Schild Hook in between the "apt-get --download-only"s and the "apt-get"s and copy out all the debs for later. Signed-off-by: Henning Schild --- meta/classes/deb-dl-dir.bbclass | 14 ++++++++++++++ meta/classes/dpkg-base.bbclass | 1 + meta/classes/dpkg-gbp.bbclass | 1 + meta/classes/dpkg.bbclass | 1 + meta/classes/image-locales-extension.bbclass | 2 +- meta/classes/image-tools-extension.bbclass | 1 + meta/classes/rootfs.bbclass | 12 ++++++++++-- meta/conf/bitbake.conf | 1 + 8 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 meta/classes/deb-dl-dir.bbclass diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass new file mode 100644 index 0000000..e58df7a --- /dev/null +++ b/meta/classes/deb-dl-dir.bbclass @@ -0,0 +1,14 @@ +# This software is a part of ISAR. +# Copyright (C) 2019 Siemens AG +# +# SPDX-License-Identifier: MIT + +deb_dl_dir_export() { + export pc="${DEBDIR}/${DISTRO}" + export rootfs="${1}" + mkdir -p "${pc}" + flock "${pc}".lock -c ' \ + sudo find "${rootfs}"/var/cache/apt/archives/ -type f -iname '*\.deb' \ + -exec cp -f '{}' "${pc}" \; + ' +} diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index b39df5c..8815478 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -8,6 +8,7 @@ inherit buildchroot inherit debianize inherit terminal inherit repository +inherit deb-dl-dir DEPENDS ?= "" diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index d9c3af0..9e6945b 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -16,6 +16,7 @@ do_install_builddeps_append() { sudo -E chroot ${BUILDCHROOT_DIR} \ apt-get install -y -o Debug::pkgProblemResolver=yes \ --no-install-recommends --download-only ${GBP_DEPENDS} + deb_dl_dir_export "${BUILDCHROOT_DIR}" sudo -E chroot ${BUILDCHROOT_DIR} \ apt-get install -y -o Debug::pkgProblemResolver=yes \ --no-install-recommends ${GBP_DEPENDS} diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index d809cca..b6844e9 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -9,6 +9,7 @@ do_install_builddeps() { E="${@ bb.build.exec_func('isar_export_proxies', d)}" sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ ${PP}/${PPS} ${DISTRO_ARCH} --download-only + deb_dl_dir_export "${BUILDCHROOT_DIR}" sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ ${PP}/${PPS} ${DISTRO_ARCH} dpkg_undo_mounts diff --git a/meta/classes/image-locales-extension.bbclass b/meta/classes/image-locales-extension.bbclass index 3c0758f..0f0d0ca 100644 --- a/meta/classes/image-locales-extension.bbclass +++ b/meta/classes/image-locales-extension.bbclass @@ -25,7 +25,7 @@ def get_nopurge(d): j.split()[0].split(".")[0], j.split()[0])))) -ROOTFS_INSTALL_COMMAND_BEFORE_CLEAN += "image_install_localepurge_download" +ROOTFS_INSTALL_COMMAND_BEFORE_EXPORT += "image_install_localepurge_download" image_install_localepurge_download[weight] = "40" image_install_localepurge_download() { sudo -E chroot '${ROOTFSDIR}' \ diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 243fa11..3906585 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -34,6 +34,7 @@ do_install_imager_deps() { --allow-unauthenticated --allow-downgrades --download-only install \ ${IMAGER_INSTALL}' + deb_dl_dir_export ${BUILDCHROOT_DIR} sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ --allow-unauthenticated --allow-downgrades install \ diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 095ebc1..841aa89 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -1,6 +1,8 @@ # This software is a part of ISAR. # Copyright (c) Siemens AG, 2019 +inherit deb-dl-dir + ROOTFS_ARCH ?= "${DISTRO_ARCH}" ROOTFS_DISTRO ?= "${DISTRO}" ROOTFS_PACKAGES ?= "" @@ -119,8 +121,14 @@ rootfs_install_pkgs_download() { /usr/bin/apt-get ${ROOTFS_APT_ARGS} --download-only ${ROOTFS_PACKAGES} } -ROOTFS_INSTALL_COMMAND_BEFORE_CLEAN ??= "" -ROOTFS_INSTALL_COMMAND += "${ROOTFS_INSTALL_COMMAND_BEFORE_CLEAN}" +ROOTFS_INSTALL_COMMAND_BEFORE_EXPORT ??= "" +ROOTFS_INSTALL_COMMAND += "${ROOTFS_INSTALL_COMMAND_BEFORE_EXPORT}" + +ROOTFS_INSTALL_COMMAND += "rootfs_export_package_cache" +rootfs_export_package_cache[weight] = "5" +rootfs_export_package_cache() { + deb_dl_dir_export ${ROOTFSDIR} +} ROOTFS_INSTALL_COMMAND += "${@ 'rootfs_install_clean_files' if (d.getVar('ROOTFS_CLEAN_FILES') or '').strip() else ''}" rootfs_install_clean_files[weight] = "2" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 4c0a809..56f4fbf 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -26,6 +26,7 @@ DEPLOY_DIR = "${TMPDIR}/deploy" FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE', False))}" GITDIR = "${DL_DIR}/git" +DEBDIR = "${DL_DIR}/deb" DEBSRCDIR = "${DL_DIR}/deb-src" P = "${PN}-${PV}" PF = "${PN}-${PV}-${PR}" -- 2.23.0