From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003121820762112 X-Received: by 2002:a2e:93d5:: with SMTP id p21mr19916309ljh.50.1576497015531; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9786:: with SMTP id y6ls2215122lji.4.gmail; Mon, 16 Dec 2019 03:50:14 -0800 (PST) X-Google-Smtp-Source: APXvYqz5ZBvK/xvHhkEx1rud+z5+w5HZDf+A7MssuUTBBwc8q3dSyQx0l1r9yMC87lpGTDEW1NCR X-Received: by 2002:a2e:6e10:: with SMTP id j16mr19072030ljc.202.1576497014811; Mon, 16 Dec 2019 03:50:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576497014; cv=none; d=google.com; s=arc-20160816; b=r6mlgjItaldFhTN0F7dMljijlh3Dd4FvtgtHjLqet5OCNkvt20UAatIwKy18A4q6JS NCzu5AViENEUGjBvsG8JISk9vuncr8yOXw/NfzF5y5D+ahURwI5YUPfqQsK49HBDXgsQ 5YzPI+hWz3iQpYNMqB5LOAY/O4e5Bd3fqoVke2oO58aTUyboFGwyA8B6zvIULNQ1BfL+ S2ZU3ZHJqUgO/uHS5mg2IRhozCF4FBGgnjcoN5JJWFq3m2ZTQ64XYj/acassXkpb+nOg diFya08jokBJaIblpdTN09ZPiy+eXx5nYRaZ9yUCD9FXp41yn2mD5ZOJqoF4dG/sJrA9 KHVg== 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=uMcsHFu3WoKNgrc+bI1rXhPvtPjpcj8/QIVdND9gbQg=; b=Z0SDZvAEmY5XED2rJDaw0s7tDgmWhAb1cGZuqZPR7y8tOqFDy10CC9iY16jycF+E8g bhScaB+1jridk3YeaXdYdzeQxNBK9fGjFvmgzVN1zy2lf3D4YkSwqg/BdkZqRxXy5xjz t8ASlNpXWZw4FHMPS52YALIUfYh1L96OJptzgM14X1S4yCf3u8wQdNB43LZhQhCh3ezF f1ngWuLF+8491XbaBATfC0Mm1Nrxs5pyljRkNVnWfkQ5pv52nvCgSA9r4GyUYU39x3MN qjy61vGIIco7JkakMzK9H9OajENtMPIUoXxX+MUJJ5ZE2hshXr0yLcCxAlXqf8LdfWR1 ieFg== 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 e3si576237ljg.2.2019.12.16.03.50.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 03:50:14 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id xBGBoD61003830 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Dec 2019 12:50:13 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.101]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xBGBoDWN009084; Mon, 16 Dec 2019 12:50:13 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Baurzhan Ismagulov , chombourger@gmail.com, Henning Schild Subject: [PATCHv2 02/25] dpkg-base: add download caching of apt:// downloads Date: Mon, 16 Dec 2019 12:49:48 +0100 Message-Id: <20191216115011.17664-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216115011.17664-1-henning.schild@siemens.com> References: <20191216115011.17664-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 2ZnpBOPSUeyL 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 f38168c..7a97d91 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 0eb3b54..ab608da 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