From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:a7b:c767:: with SMTP id x7mr4700078wmk.85.1572364990615; Tue, 29 Oct 2019 09:03:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:1a10:: with SMTP id a16ls3556736wma.5.gmail; Tue, 29 Oct 2019 09:03:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqzaHaflW79PuUlQjl9H18mmm2w5pHRarPFeKdWsFyMmzytntMuSUZZvzWRNJRJ1Xi1xEbWj X-Received: by 2002:a1c:4d03:: with SMTP id o3mr4811996wmh.73.1572364989879; Tue, 29 Oct 2019 09:03:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572364989; cv=none; d=google.com; s=arc-20160816; b=jTO0FHcduNva2vX0HFd8YGlBzgsRBEypPfE7QOldNKNawOI/qyuP5jcge1+KQoVQyh orBU8U9fSnLD5h43BfwQeKRKQ2LFg1Pnn9+QN3+SRyb8w6AnhWXx3HjqDLiTPqEpvcQH lpILS8fUs7DxJgXU9FQf4rITZNorFySQPC01wYoEHdCsiIoXdN/Vn8ihbDOLDak9azRc mtINS6itcRbOu3BOCSYbesSgFy9z+XLXftg4ultfYK/ZGZizFe9RfK/Sa1Gx+MNePFfu BmzRBVfcIusdESuDHO2X+jr4Ru17WwJfrqAtqY16KJ5GdIP6PgwY3muuGGRC2y4nbtiF Z+qg== 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=JuLON2xR1ojSb8fAScD47NJbBEuLRJSrDijjHIfIqA4=; b=L9mZjNFmUddAtUppo+4WjBMA2LChenlnC9YjpSs2YMrApLePJEzVMOEK67LhZRtJjL 4utEyQVsK2VP7fTaxRu+wfeql4WP+fwl8CH6GeOmdYxY5kW+gSsLKyMSwwAiOGcA3tOT Gkpd5REOyHvnHttUbfHZcDuH/ElS37f54FkNM6qtyDbCJ+o6yuQajE93OSumNusDPug9 fIUjcbqgOLZOA6EQ03nVh9sdpBhhE/BDWrcK6NQhM+BMoy9BD6/6FPWUO/Rht/2T+kFz tvrKN1eQLRhVhGGTmcW06R8fG6wscOf4Ucw/YVWd62dWm9J33d4qH9que4HSGFFSQSlj fOMA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id z8si156019wmi.1.2019.10.29.09.03.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Oct 2019 09:03:09 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x9TG39ti018877 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Oct 2019 17:03:09 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.153]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9TG39XN002530; Tue, 29 Oct 2019 17:03:09 +0100 Date: Tue, 29 Oct 2019 17:03:08 +0100 From: Henning Schild To: Cc: isar-users Subject: Re: [PATCH 02/17] dpkg-base: add download caching of apt:// downloads Message-ID: <20191029170308.4e410f0d@md1za8fc.ad001.siemens.net> In-Reply-To: References: <20191028170132.28072-1-henning.schild@siemens.com> <20191028170132.28072-3-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: XmvzBBCv0IWk On Tue, 29 Oct 2019 05:57:49 -0700 wrote: > On Monday, October 28, 2019 at 6:01:35 PM UTC+1, Henning Schild wrote: > > > > From: Henning Schild > > > > > Store the results of "apt-get source" in the DL_DIR. This means we > > really only need to fetch once on incemental rebuilds or if > > multiple recipes use the same SRC_URI. > > We can also later collect the results and put them in a repository. > > > > Signed-off-by: Henning Schild > > > --- > > meta/classes/dpkg-base.bbclass | 20 ++++++++++++++++++-- > > meta/conf/bitbake.conf | 1 + > > 2 files changed, 19 insertions(+), 2 deletions(-) > > > > diff --git a/meta/classes/dpkg-base.bbclass > > b/meta/classes/dpkg-base.bbclass > > index 3f1e99f..b39df5c 100644 > > --- a/meta/classes/dpkg-base.bbclass > > +++ b/meta/classes/dpkg-base.bbclass > > @@ -37,14 +37,30 @@ do_apt_fetch() { > > -o Dir::Etc::SourceParts="-" \ > > -o APT::Get::List-Cleanup="0" > > > > - sudo -E chroot --userspec=$( id -u ):$( id -g ) > > ${BUILDCHROOT_DIR} \ > > - sh -c 'cd ${PP} && apt-get -y --only-source source > > ${SRC_APT}' > > + for uri in "${SRC_APT}"; do > > + sudo -E chroot --userspec=$( id -u ):$( id -g ) > > ${BUILDCHROOT_DIR} \ > > + sh -c 'mkdir -p /downloads/deb-src/"$1"/"$2" && cd > > /downloads/deb-src/"$1"/"$2" && apt-get -y --download-only > > --only-source source "$2"' my_script "${DISTRO}" "${uri}" > > + sudo -E chroot --userspec=$( id -u ):$( id -g ) > > ${BUILDCHROOT_DIR} \ > > + sh -c 'cp /downloads/deb-src/"$1"/"$2"/* ${PP} && cd > > ${PP} && apt-get -y --only-source source "$2"' my_script > > "${DISTRO}" "${uri}" > > + done > > + > > dpkg_undo_mounts > > } > > > > addtask apt_fetch after do_unpack before do_patch > > do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" > > > > +addtask cleanall_apt before do_cleanall > > +do_cleanall_apt[nostamp] = "1" > > +do_cleanall_apt() { > > + if [ -z "${@d.getVar("SRC_APT", True).strip()}" ]; then > > + exit > > > > shouldn't this be "return 0" instead? > (or are we really wanting to exit the bitbake process here? I am pretty sure i tested it and bitbake survived. But i will double-check or maybe just return 0 anyways. Henning > > > + fi > > + for uri in "${SRC_APT}"; do > > + rm -rf "${DEBSRCDIR}"/"${DISTRO}"/"$uri" > > + done > > +} > > + > > def get_package_srcdir(d): > > s = os.path.abspath(d.getVar("S", True)) > > workdir = os.path.abspath(d.getVar("WORKDIR", True)) > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > > index bca1114..4c0a809 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" > > +DEBSRCDIR = "${DL_DIR}/deb-src" > > P = "${PN}-${PV}" > > PF = "${PN}-${PV}-${PR}" > > PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', > > False),d)[0] or 'defaultpkgname'}" > > -- > > 2.23.0 > > > > >