From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a19:cb17:: with SMTP id b23mr5689692lfg.201.1580481004261; Fri, 31 Jan 2020 06:30:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:ec09:: with SMTP id b9ls76986lfa.6.gmail; Fri, 31 Jan 2020 06:30:03 -0800 (PST) X-Google-Smtp-Source: APXvYqx5awLK2cwv5L6QUZaqED1XjlWinXOKYxzr3JMq6E+bWiZ1KUTZGhODRasbNf7p1AT7/qm0 X-Received: by 2002:a19:c82:: with SMTP id 124mr5600036lfm.152.1580481003587; Fri, 31 Jan 2020 06:30:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580481003; cv=none; d=google.com; s=arc-20160816; b=zorbwbDgcch/MQOABhoL3bMS+y6Qa1Lg3krfruQSv4MLx84lgZ9HTrxgj19FMR9G/2 ApUXI01A2sLZ5OrNaBOV/LwZNmgRpBS4U0cjir/DaegUnG/D3u1+Fg/ih/mSI+W5Lyor oVhcPXtmPIUxG9jiheWzlCChzNcIq+rCKmDfA2YYVDkzfZuM397qAbXM21We+NSq/LdT jMU4u6PKcSPPDSeA7tYMJ1BJfMab4SEjZzRYOJDTimBoeRP26/klt2xnwkCTce1IEOtp dCj7o8E6iPbVBqOzcgDKYb28ptkFcaCgVbS369EhWz+K/V1NsM/pt25dqjW+r9jCklFX U+/Q== 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=umlmGK8MTmjw7Bkufp8kOYqNx0kbk2ZNCIJpG46BoMk=; b=IVIjh6HlzRKSNQCxz/JzL6+3Zi4glCUlaNF41+fJ9nDAPItEQOmoofixgKYVGFon38 MOeh947BWX+vS0QPOf7L+ZHDh56dVGM9zf5HZs9vS3w6+Z9+zi0743/+mU86NVHKbhKw N5sF2qxLDm8rHAdU1RmrEsulbxcwP9uB944j26k/7DsNsac+jrcnZttXwuWLA6tekFY+ 79e6jjP2Azr1GdYkCojDGQ2JHClwRDtDwoGvNpaOsAt1uKQoVYG/RVIq8NHR1V8QSM29 iE2Ryzjj94itNnxbCVYLjBQ2kEpeWrQO93dNB2dKvLVJBYYZu/9CB1YlU4qPCNN0QLas 5m/Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id j30si410052lfp.5.2020.01.31.06.30.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jan 2020 06:30:03 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 00VEU1Bl008620 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jan 2020 15:30:02 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.68.229]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00VEU1RG030231; Fri, 31 Jan 2020 15:30:01 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Henning Schild Subject: [PATCHv4 02/26] dpkg-base: add download caching of apt:// downloads Date: Fri, 31 Jan 2020 15:29:36 +0100 Message-Id: <20200131143000.14873-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200131143000.14873-1-henning.schild@siemens.com> References: <20200131143000.14873-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: XmKOGbxb3adB From: Henning Schild Store the results of "apt-get source" in the DL_DIR. This means we really only need to fetch once on incremental 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 f38168c7..7a97d91e 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -63,14 +63,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 + 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 0eb3b544..ab608da1 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" +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.24.1