From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
To: <isar-users@googlegroups.com>
Cc: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
Subject: [PATCH v8 05/14] deb-dl-dir: Download files only belonging to the current image
Date: Wed, 25 Nov 2020 19:14:05 +0530 [thread overview]
Message-ID: <20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com> (raw)
In-Reply-To: <20201125134236.25878-5-Vijaikumar_Kanagarajan@mentor.com>
Avoid downloading deb-srcs for debs cached from other image builds.
One way to ensure that is to see if the package is present in the dpkg
status file.
Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
meta/classes/deb-dl-dir.bbclass | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass
index 79a9a88..ce691cf 100644
--- a/meta/classes/deb-dl-dir.bbclass
+++ b/meta/classes/deb-dl-dir.bbclass
@@ -5,6 +5,15 @@
inherit repository
+is_not_part_of_current_build() {
+ local package="$( dpkg-deb --show --showformat '${Package}' "${1}" )"
+ local output="$( grep -hs "^Package: ${package}" \
+ "${IMAGE_ROOTFS}"/var/lib/dpkg/status \
+ "${BUILDCHROOT_HOST_DIR}"/var/lib/dpkg/status \
+ "${BUILDCHROOT_TARGET_DIR}"/var/lib/dpkg/status )"
+ [ -z "${output}" ]
+}
+
debsrc_download() {
export rootfs="$1"
export rootfs_distro="$2"
@@ -18,6 +27,7 @@ EOSUDO
set -e
printenv | grep -q BB_VERBOSE_LOGS && set -x
find "${rootfs}/var/cache/apt/archives/" -maxdepth 1 -type f -iname '*\.deb' | while read package; do
+ is_not_part_of_current_build "${package}" && continue
local src="$( dpkg-deb --show --showformat '${source:Package}' "${package}" )"
local version="$( dpkg-deb --show --showformat '${source:Version}' "${package}" )"
local dscfile=$(find "${DEBSRCDIR}"/"${rootfs_distro}" -name "${src}_${version}.dsc")
--
2.17.1
next prev parent reply other threads:[~2020-11-25 13:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-25 13:42 [PATCH v8 00/14] Deb-src caching Vijai Kumar K
2020-11-25 13:42 ` [PATCH v8 01/14] rootfs: Make rootfs finalize a separate task Vijai Kumar K
2020-11-25 13:42 ` [PATCH v8 02/14] deb-dl-dir: Cache host distro debs separately Vijai Kumar K
2020-11-25 13:42 ` [PATCH v8 03/14] meta: cache deb srcs as part of postprocessing Vijai Kumar K
2020-11-25 13:42 ` [PATCH v8 04/14] deb-dl-dir: Make debsrc_download faster Vijai Kumar K
2020-11-25 13:44 ` Vijai Kumar K [this message]
2020-11-25 13:44 ` [PATCH v8 06/14] deb-dl-dir: Factor out the mounting part Vijai Kumar K
2020-11-25 13:44 ` [PATCH v8 07/14] deb-dl-dir: Fix skipping of removed files Vijai Kumar K
2020-11-25 13:44 ` [PATCH v8 08/14] repository: Add a sanity test to check missing sources Vijai Kumar K
2020-11-25 13:44 ` [PATCH v8 09/14] base-apt: Introduce BASE_REPO_FEATURES Vijai Kumar K
2020-11-25 13:45 ` [PATCH v8 10/14] repository: Fix failures due to missing section Vijai Kumar K
2020-11-25 13:45 ` [PATCH v8 11/14] scripts/ci_build.sh: Enable deb-src caching Vijai Kumar K
2020-11-25 13:45 ` [PATCH v8 12/14] rootfs: Fix possible overwrite of existing resolv.conf Vijai Kumar K
2020-11-25 13:45 ` [PATCH v8 13/14] rootfs: Handle failures when postprocess is rerun Vijai Kumar K
2020-11-25 13:45 ` [PATCH v8 14/14] doc/user_manual.md: Document details about deb-src caching Vijai Kumar K
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com \
--to=vijaikumar_kanagarajan@mentor.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox