From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a17:906:1e56:: with SMTP id i22mr20487015ejj.314.1583877403579; Tue, 10 Mar 2020 14:56:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d4d7:: with SMTP id t23ls10812178edr.9.gmail; Tue, 10 Mar 2020 14:56:43 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvWrXRXQFC2i9vz2tsirEcEcScrmCEIrBuNn3E01tTZadCpQGRbkxIDjx1vQJuC0/wcq7y6 X-Received: by 2002:a05:6402:388:: with SMTP id o8mr13892307edv.125.1583877403083; 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=yKe1n9j1k8wg9ZXjcP7jnMjX8/1YaqG7qPWTlEo7nWlTNkMY+e/ULZrCA5W+sn7mQQ axNMYEimsyuJYhflHQgkmgD8w7S0FmsVeVDJ//WeDfmbh91SCYbEicRax1VAHzYZQdvV AL8mV2wKIBlRnCmm9OL2haZFAY21RKty3Q9NJAUNQ4COeoxmrRWe6lGMdWEhGddpYWNr cq2x6PVmrlodQzAmrJMaHsp9QAWcM1r4VVGke3vJPRdjLXmQRC2jIVbPIzMpPdxVGLAF LdfoGXDN/7YFUrSf98ZasVrtN+Db8JtU69CfbS9hgz2MEerfCYSppbmwIRCPdcH/Xjn+ xxvA== 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=WOndSrYbb+Mf07Z2tkS9w8/fSBYcqzAbofaxjG8K+QA=; b=ff7VVb87u7sRd2NAM2r8hrYf9akTt8gUgKzWB/8dhvE8mAT5VQSwAIDMONik5liWo5 1mCUyFNUMaF1x1ObGKshzejr5HL/aQeZEsQYQ3BN1dOac7I8TSIQrrnynRt1FOzyJU9j iLNrw5zS+s0uXDm+aBIXrb+sXe8d7xVXhQfNcXmfE8vzoIwzHh9fjWOij8jhm1pkqa2C JVSkyQRbrWbgbU98tNUTgLDqBk1fWwIff6ml5Gpslte3FtLuWYdr7EoyeRJB0QHjYvB1 DmnydU/ryzisgOfrSy1i4edHhjasL5oqV+xEQUjOVM8aT4cdldBd+O6aAgFOL7EJOS/+ 5Ckg== 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 d7si4094edo.5.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.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 02ALugse005798 (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 02ALub5r026985; 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 09/29] meta: create DL_DIR support for all apt-get downloaded .debs Date: Tue, 10 Mar 2020 22:56:11 +0100 Message-Id: <20200310215631.24859-10-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: nPNYRAE1qQgS 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 | 15 +++++++++++++++ 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 | 14 +++++++++++--- meta/conf/bitbake.conf | 1 + 8 files changed, 32 insertions(+), 4 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 00000000..066ce1a3 --- /dev/null +++ b/meta/classes/deb-dl-dir.bbclass @@ -0,0 +1,15 @@ +# This software is a part of ISAR. +# Copyright (C) 2020 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}" \; + sudo chown -R $(id -u):$(id -g) "${pc}" + ' +} diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 5dd334d0..9aa2d546 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 2afe9db4..7e908eba 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -15,6 +15,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 b26c6456..7e2c86d6 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -9,6 +9,7 @@ do_install_builddeps() { E="${@ 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 3c0758ff..0f0d0ca4 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 b8531cb4..ec67d940 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 64eaef70..706b43a7 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -1,5 +1,7 @@ # This software is a part of ISAR. -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2020 + +inherit deb-dl-dir ROOTFS_ARCH ?= "${DISTRO_ARCH}" ROOTFS_DISTRO ?= "${DISTRO}" @@ -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 6b05e91b..b7c0a8f5 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -26,6 +26,7 @@ DEPLOY_DIR = "${TMPDIR}/deploy" FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE', False))}" FILESEXTRAPATHS ?= "__default:" GITDIR = "${DL_DIR}/git" +DEBDIR = "${DL_DIR}/deb" DEBSRCDIR = "${DL_DIR}/deb-src" P = "${PN}-${PV}" PF = "${PN}-${PV}-${PR}" -- 2.24.1