From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:a5d:50c2:: with SMTP id f2mr2691847wrt.147.1573046366976; Wed, 06 Nov 2019 05:19:26 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f091:: with SMTP id n17ls1558560wro.4.gmail; Wed, 06 Nov 2019 05:19:26 -0800 (PST) X-Google-Smtp-Source: APXvYqzF4Hg338aNLFxN6FKgExw7jCQ/KS0UUQjWzXBZy6dZiaXFOM0eUZEl4FcK4T7Jd4dg/Z17 X-Received: by 2002:adf:e886:: with SMTP id d6mr2803407wrm.188.1573046366448; Wed, 06 Nov 2019 05:19:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573046366; cv=none; d=google.com; s=arc-20160816; b=vwoBHgGvnB+3kQK9qaAJgpJBtgS3o+i6Z4fuXExxLQ6uKa7Hfd4yVJ49TDXOjqniFV wlyZY0Txh41DKHpTICaWUt03eQz8wup0hp2NA4fBXXoiIDES3GXb1Zdv2zBR7WT6tVWe SpnnVYHGt4EiDyh8FkxGOldFTEy5NckUV8JkLufi+sQkhlkbXkaM/4STVZRtRyd0YA3G BSz+qQnE1zx58NW8zXfsvlh6lV+qsSh8TC03JRmnqQSkbFeUQQWLUE/j98cdCMft/8iZ oaL385/kWZA0DjEQgcCkW2tKy8n5U6Ue+lY+H23IY1yFz59uqxbuCEqrZKsoPI3fNN8w z/0Q== 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:subject:cc:to:from:date; bh=62LzXjD9t4qdTqEhRFYKM5fRGfY0k4B1cndE6ub6G94=; b=KPX18Y97Ds0/bMX0Jk1XmW4fuLuWL+9UhXHSHrjKFcXX2a1jQ37S/qON2IKp/A1KhJ DSfX1d3FA+g6m6OnKOvbi2Zf0JADyXnY6UOEFXxmWKStDT9rxFpAuzvdfWsnrP9cVt4U 2Ms42+Ze32nQ6RSBTeCb+UpMIHBAPdZN7fcl0PJwexznUrsoJyifXjUAxZJjNYClMBDN 11pwshBk6jN0ZSoIc+oZW9t+auqaDa0qHRSBFsh+yFqamW8BOi03151hNBZ/iqac43hi j2AWS768pfigMDRJmluZaWtWhLXr09glB1FDBA6c6eUCu0gTJQyTVAnZZSs3bmdZnk2p ICsA== 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 w6si211607wmk.3.2019.11.06.05.19.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Nov 2019 05:19:26 -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 xA6DJPjH007235 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 6 Nov 2019 14:19:25 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.32]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xA6DJPgo001619; Wed, 6 Nov 2019 14:19:25 +0100 Date: Wed, 6 Nov 2019 14:19:17 +0100 From: Henning Schild To: Cc: isar-users Subject: Re: [PATCH 08/17] meta: create DL_DIR support for all apt-get downloaded .debs Message-ID: <20191106141917.272e393d@md1za8fc.ad001.siemens.net> In-Reply-To: <5c2908a6-97df-46dd-bb9b-21af77202918@googlegroups.com> References: <20191028170132.28072-1-henning.schild@siemens.com> <20191028170132.28072-9-henning.schild@siemens.com> <5c2908a6-97df-46dd-bb9b-21af77202918@googlegroups.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: JIVVHmWDvb+w Am Tue, 29 Oct 2019 05:48:01 -0700 schrieb : > On Monday, October 28, 2019 at 6:01:36 PM UTC+1, Henning Schild wrote: > > > > 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}" \; > > > > use -exec command {} + to reduce the number of fork/execvp pairs? > note: you would need to use cp -t "${pc}" since the "+" modifier > appends matches to the end of the command In fact this guy will need to get more complicated, since it should skip all files that came from isar-apt. They are not "downloads" in the overall Isar picture and they should also not become part of a base-apt we later generate from the downloads. So i think each iteration will become more costly and we can not do many at once. Henning > > > + ' > > +} > > 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 > > > > >