From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003123014041600 X-Received: by 2002:a5d:4d0e:: with SMTP id z14mr28764835wrt.208.1576497015495; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:c3d1:: with SMTP id d17ls6232280wrg.10.gmail; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-Google-Smtp-Source: APXvYqzU6y0SbZqWJonLy3njiFUDfC+cWeuq5c1IJUSRF9kUmIkCXXH4Cscthg0R4GCP80Puy0vk X-Received: by 2002:adf:f847:: with SMTP id d7mr30892356wrq.35.1576497014991; Mon, 16 Dec 2019 03:50:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576497014; cv=none; d=google.com; s=arc-20160816; b=ub9xl3sB6wUAhUMhh6mQWP+iCYFfxemwiTsVFGCf5N4AhGDEW6/sAbM/KvQV0iWyZn 94DalgnLF0pj8LxS3O7k/bx2VdpgHjfKVUJQH23XpT9nw9e1ROs+BMUgj8nq+bHcTcOA H3Po6j8MMpf3zIh5tcQjw6MncjCvIlExBzPsyJyWbivfsz0sGAxCKshFPfe1Nex83q75 Jhzjff70JMmRzrJ14ANzSphQpArw6jzfXMjghnzgf6pkMmV0G32pCmxFSfi4zt2FYess v2o3vhoSV9YxjAWoArk72rNqSvMjO1j/yXM+23XHIKD1UNnoydgu+iqQBLOKcj7mBA9P wBRQ== 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=p3FU6q/Ggyq6RFeuH1uguJX1aZYWjUMPWnqXqzAXU3g=; b=fQZHR0a7Ref+aQwJT5fRNwwskXWOqKmlI8tFAi4ykOZifpAUJFsNg/m7+Hre8bzQvf ZWtIp4NSHd+HcHRkRIH00NvB5Fy1+I6067qRzX1HzLHmp3XPCKtymGS/U+zx5F9MssyS tRY1aFiIACXnAMwtk/aB1iX0yxmPVjdMP7GM0MX1ZpXZd1M0Rw+XZcaT9s0CRkAPuCHX O9oP0Cs1b9+dgrv7qbf3gTiPVJvV8w7DvisjDxe23gPiM/VY+6B9rskHsdKMShvgQ8Y8 rmTjk+nD12qcbPznNYjTpu1qFutyp7i1IPzPHXRgDevypZUL30E9tSFg8WJjY79awL3g Rz0w== 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 t131si545890wmb.1.2019.12.16.03.50.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 03:50:14 -0800 (PST) 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 xBGBoEXg024855 (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 xBGBoDWU009084; 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 09/25] meta: create DL_DIR support for all apt-get downloaded .debs Date: Mon, 16 Dec 2019 12:49:55 +0100 Message-Id: <20191216115011.17664-10-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: RY0HhEwNAYTH 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 | 12 ++++++++++-- meta/conf/bitbake.conf | 1 + 8 files changed, 31 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..e41e981 --- /dev/null +++ b/meta/classes/deb-dl-dir.bbclass @@ -0,0 +1,15 @@ +# 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}" \; + sudo chown -R $(id -u):$(id -g) "${pc}" + ' +} diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index aa11660..fd0b07f 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 2afe9db..7e908eb 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 b26c645..7e2c86d 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 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 b8531cb..ec67d94 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 b4dbfa3..a6b6110 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 ab608da..d86c5b9 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