From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6802701637858099200 X-Received: by 2002:a17:906:6d42:: with SMTP id a2mr20528025ejt.98.1583877400733; Tue, 10 Mar 2020 14:56:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:416:: with SMTP id q22ls10795409edv.10.gmail; Tue, 10 Mar 2020 14:56:40 -0700 (PDT) X-Google-Smtp-Source: ADFU+vs6RlbXv5YHMxvt+A7fyrmQj3TkCCqh1/aWmsPqgdCwhagtjKYBiSVAbIGRJRE33w8r1aOI X-Received: by 2002:a05:6402:1776:: with SMTP id da22mr24334131edb.354.1583877400164; Tue, 10 Mar 2020 14:56:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583877400; cv=none; d=google.com; s=arc-20160816; b=mXGg1xPfCBXzl6yMnOcdO3vpVBmkYqV2BdPys05GNygCZzfMI/LaUpNloheOI+IZ86 S9EWiJCnz93cDTQDYyfwukmvt3mjN3Lk43R/IK77rz+E4Zlru+J6KTiMD+lMVKLVNFzh waTltATH1wCRHj0AR7zQHZ871vyjB0NxNc+BzAcC430hDgdPVqY0sHeIbPWHzYwFODIh wpAYpklOo1d2prLLaCQKF1nTQJJTt86PSmVpNtd/ugHwWxm6r9TH4mtX7SaykblMrrco 04tI+2aC5gSO9A61DR9dHLVzgGAuHw5en3VRec1eoOo11Sc+j4oZWBDH+HTmi3RyaNyv 17iQ== 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=Wz7NlqYg0agSRy5dxzPAMoMY7vvl41jGK+wqOGd5hoo=; b=x79F5tLF5KgAE0n70Sp9lLm0I0xIStndK1fEmbaOx10xohBnb5ePnLz3lX08w03dhS U9bmi3XyA1IQ2gqNQfi4JUs+WP/dsFswpjrpYdfKfvSst0Wpr1R5sYWfMqK1MXXCOV2m +GbE+/2gL4AIUrtNc4j5tkHCREu3b6mwBoVfu85OYfc/hKan+/obNYHEsSOpfKtFreuY gRD1F7/XENWOqSdiy0wzkI8+PxU/QtzqAHvGakKoq88wB0Bmg9ZosIePL2yagBTluDqX 4UlBpvG+GfwP5CUfVNsTaUmUCGM515GmKkHxeB2i4saSAnm4sWw4UdlYmAvekvNWFMj8 vtiQ== 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 x7si12407ejw.0.2020.03.10.14.56.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2020 14:56:40 -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 02ALudcH011323 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Mar 2020 22:56:39 +0100 Received: from localhost.localdomain ([139.22.36.172]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02ALub5k026985; Tue, 10 Mar 2020 22:56:38 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv5 02/29] dpkg-base: add download caching of apt:// downloads Date: Tue, 10 Mar 2020 22:56:04 +0100 Message-Id: <20200310215631.24859-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200310215631.24859-1-henning.schild@siemens.com> References: <20200310215631.24859-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: LOzgkXeQBjek 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 4702e52b..1000ef37 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -65,14 +65,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 ab954b1f..6b05e91b 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