From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
To: <isar-users@googlegroups.com>
Cc: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
Subject: [PATCH v8 07/14] deb-dl-dir: Fix skipping of removed files
Date: Wed, 25 Nov 2020 19:14:07 +0530 [thread overview]
Message-ID: <20201125134414.26061-3-Vijaikumar_Kanagarajan@mentor.com> (raw)
In-Reply-To: <20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com>
Some packages are installed and then removed, like localepurge from
image-locales-extension.bbclass. Those information would not be
available in dpkg status file. Use dpkg log instead to see if the
package has been used on the target.
Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
meta/classes/deb-dl-dir.bbclass | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass
index b2d94e7..a94fb10 100644
--- a/meta/classes/deb-dl-dir.bbclass
+++ b/meta/classes/deb-dl-dir.bbclass
@@ -7,10 +7,16 @@ 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 )"
+ local arch="$( dpkg-deb --show --showformat '${Architecture}' "${1}" )"
+ local version="$( dpkg-deb --show --showformat '${Version}' "${1}" )"
+ # Since we are parsing all the debs in DEBDIR, we can to some extend
+ # try to eliminate some debs that are not part of the current multiconfig
+ # build using the below method.
+ local output="$( grep -hs "status installed ${package}:${arch} ${version}" \
+ "${IMAGE_ROOTFS}"/var/log/dpkg.log \
+ "${BUILDCHROOT_HOST_DIR}"/var/log/dpkg.log \
+ "${BUILDCHROOT_TARGET_DIR}"/var/log/dpkg.log | head -1 )"
+
[ -z "${output}" ]
}
--
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 ` [PATCH v8 05/14] deb-dl-dir: Download files only belonging to the current image Vijai Kumar K
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 ` Vijai Kumar K [this message]
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-3-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