From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:a5d:5011:: with SMTP id e17mr1431885wrt.160.1572463305932; Wed, 30 Oct 2019 12:21:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:dd03:: with SMTP id a3ls334159wrm.6.gmail; Wed, 30 Oct 2019 12:21:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqxYBqqFS+YHRhMcfTOyijHALfNEuKrV57V3Nz3DRHEVzAkmCoYN/kSEd7Xkgz4MuCTnL4sy X-Received: by 2002:adf:ff81:: with SMTP id j1mr1448457wrr.98.1572463305240; Wed, 30 Oct 2019 12:21:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572463305; cv=none; d=google.com; s=arc-20160816; b=FOBeyWyynP0rtDUPcqtntJzmLXNqMw9vczpq9AN84F1Ej+T0720DbNwjkyZ+4VMsnI 73ffl7PIvPuncOpZfC/BlzT8z6z7h8ehUYVNytKQNUVzO8G2WPTC3go3L1lcsGn7MqUE X9A/76FK0xOXGJGcRheor46pMNqsEp7viDTrLRMdd2COSayDcM+9uPzeZsiQDptvjdvs MOfmiuLMXUVYBKM11MDSdMtp4OzLKOYkyJggjF5Kr9fQ71QMFRNDzabxlLumjdjyoZbO 4X5cuiaDhxCmmgiW23TL7ugSeoRleTSJGyB5RD261W18GKKy3vMgVLJdcYY5mXwf391/ 0X5g== 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:to:from:date; bh=g6TN7UAiPl30gPsN7Oo43rqv9l06OFqTXSdh4NBlG8k=; b=BMc887/0O1JuxsNIYoBDbuN8DUBG+ZJYBDVsEdzts0VNHZaNnw6xpO9JkFNtWU8d4I mTA16UvFyWJoBO9MyyDizM6ROF09+C6rsrG1FgAAToZQpkZ9F6S17fUMSnOLEXTSjQao aQGJux/aYkJn8RDV95ZDB5XFE0djZbvQnr+gYlkoLtoQUSWNDptnieLKaD3mviA7FNOg EF6OpvMxjw7CZEcxqB4SEVABHw0OP7Dl62l1+Jn0ZEQMQZj81UlRi0VWkgt3EpevdQSX 6VOljKRp5srPpXdawhE8Pm6F6DGdWBWIv6oU5v9x8nHtE1Ru6fz+t6+LvEMD9WmDctXO vSdQ== 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 y185si261378wmd.4.2019.10.30.12.21.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Oct 2019 12:21:45 -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 x9UJLis1005918 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 30 Oct 2019 20:21:44 +0100 Received: from md1za8fc.ad001.siemens.net ([139.22.36.186]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x9UJLi1h007101 for ; Wed, 30 Oct 2019 20:21:44 +0100 Date: Wed, 30 Oct 2019 20:21:38 +0100 From: Henning Schild To: Subject: Re: [PATCH 09/17] meta: import DL_DIR debs before apt-get download steps Message-ID: <20191030202138.4bb2054d@md1za8fc.ad001.siemens.net> In-Reply-To: <20191028170132.28072-10-henning.schild@siemens.com> References: <20191028170132.28072-1-henning.schild@siemens.com> <20191028170132.28072-10-henning.schild@siemens.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: nPizIpVPUlkq A future patch will actually populate base-apt out of the files in DL_DIR, i did not sent that yet. Once the creation+population is done purely from the download cache, we can not exclude packages from isar-apt anymore. At the moment i think that would not be a problem because the rebuild from base-apt will just work. isar-apt will always win and just rebuild the "same" stuff. The only problem i see is that base-apt will potentially contain product packages, which means you can not share it as widely as you can a pure "mirror", which base-apt is not anyways. Henning On Mon, 28 Oct 2019 18:01:24 +0100 Henning Schild wrote: > 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 e58df7a..b137eb9 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}" ] && exit 0 > + flock -s "${pc}".lock -c ' \ > + sudo find "${pc}" -type f -iname '*\.deb' -exec \ > + cp -f '{}' "${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 9e6945b..be0769c 100644 > --- a/meta/classes/dpkg-gbp.bbclass > +++ b/meta/classes/dpkg-gbp.bbclass > @@ -13,6 +13,7 @@ GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" > do_install_builddeps_append() { > dpkg_do_mounts > E="${@ bb.build.exec_func('isar_export_proxies', d)}" > + 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 b6844e9..9e10ad8 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="${@ bb.build.exec_func('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 3906585..08b426d > 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="${@ bb.build.exec_func('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 841aa89..845304c 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"