From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a2e:97c2:: with SMTP id m2mr5156362ljj.228.1585230211992; Thu, 26 Mar 2020 06:43:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:89c8:: with SMTP id c8ls161367ljk.7.gmail; Thu, 26 Mar 2020 06:43:31 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtS3/B1lmyjXazAwohg19Z/7xBZEuWdIvrfBKsfattpfbHSe5xQ1PrTXHUqkBYxFEjvHBtX X-Received: by 2002:a2e:8911:: with SMTP id d17mr5364836lji.16.1585230211353; Thu, 26 Mar 2020 06:43:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585230211; cv=none; d=google.com; s=arc-20160816; b=CJI1iY5sBOqnA5lbQjZ88nESowPNNlaoy3/o9TdTMn8S4KfNDtfMXtdENu1jN1K92f ps/VW8lUx3gjnlwcHZ64A5RUlko1dxZ1hMsb0YQw2K1r4ntbk3vHvEwQUZq3+oShOwZz OGFgQJQaBh4y9QfyOIcor7mytmGPJFgG6HvwLrLkt6aAonzxK4DPngb4Dqq7GFzu8ABc +olCsytHiOKnPQF5yaHMvnfTObYTzfebfSeR4piypvK1tz83VDnV/TM2GuCj6baxgiLC HPc99BLoiwLjmzzsTc1jWT5i3ENPadeKi9aj3boceCDx+VT87hkLb7cb0rsb3fBNChEy ti7g== 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=GgPMJWqDmGzlPJTUFCU2S0wqnAoDwZplakQKuugSJ9w=; b=0gjbd72CepJyyU7imR5mTcJC9JtbcJjKF1ycHuiBwOATxkUt8eq58NemCLltlNZ873 RPT2wgU2g8//j5rtwaaiIBPwl4MDAnvgsDqmxI2vNIjtwlWvKg7Cn5TYhJu1C935M5Nb o0lsRegJGsBbpXAYAStsxZkStgwtx5z7uGoHDQyvGAmqlL/VW1RFzl5Yh20MTVeXuXga wJkjd1yTFY6j0YTmMsUegQFupCIhFtmGuhd17QM9ryJb/OXz1gKTVUPbuUixcDF5Ojqu BtNGkiwKCN3wCL6r72w2Su9uD2o6HJ+5XhBSeWqdOdwOONuBLdVCYknuVzR9HOp3LFP5 ACSw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id s22si102419ljp.0.2020.03.26.06.43.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:43:31 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 02QDhUoY005979 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:43:30 +0100 Received: from localhost.localdomain ([167.87.11.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02QDhSBY031897; Thu, 26 Mar 2020 14:43:29 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv8 02/29] dpkg-base: add download caching of apt:// downloads Date: Thu, 26 Mar 2020 14:42:58 +0100 Message-Id: <20200326134325.8672-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200326134325.8672-1-henning.schild@siemens.com> References: <20200326134325.8672-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: B7z9GzHWVD92 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 4702e52..1000ef3 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 ab954b1..6b05e91 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