[PATCH] meta: Fix conflicting name of image manifest and dpkg_status

5 views
Skip to first unread message

Uladzimir Bely

unread,
Dec 23, 2021, 6:39:09 AM12/23/21
to isar-...@googlegroups.com
Features `generate-manifest` and `export-dpkg-status` should
consider multiconfigs for different distro version of the same
architecture running in parallel.

Before, only the most recent manifest and dpkg_status files were stored
in deploy directory because they overwrote existing files.

Signed-off-by: Uladzimir Bely <ub...@ilbers.de>
---
meta/classes/rootfs.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 6ecb39df..ff173ec4 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -231,14 +231,14 @@ rootfs_generate_manifest () {
sudo -E chroot --userspec=$(id -u):$(id -g) '${ROOTFSDIR}' \
dpkg-query -W -f \
'${source:Package}|${source:Version}|${binary:Package}|${Version}\n' > \
- ${ROOTFS_MANIFEST_DEPLOY_DIR}/"${PF}".manifest
+ '${ROOTFS_MANIFEST_DEPLOY_DIR}'/'${PN}-${DISTRO}-${MACHINE}'.manifest
}

ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'export-dpkg-status', 'rootfs_export_dpkg_status', '', d)}"
rootfs_export_dpkg_status() {
mkdir -p ${ROOTFS_DPKGSTATUS_DEPLOY_DIR}
cp '${ROOTFSDIR}'/var/lib/dpkg/status \
- '${ROOTFS_DPKGSTATUS_DEPLOY_DIR}'/'${PF}'.dpkg_status
+ '${ROOTFS_DPKGSTATUS_DEPLOY_DIR}'/'${PN}-${DISTRO}-${MACHINE}'.dpkg_status
}

do_rootfs_postprocess[vardeps] = "${ROOTFS_POSTPROCESS_COMMAND}"
--
2.20.1

vijai kumar

unread,
Dec 23, 2021, 8:31:28 AM12/23/21
to Uladzimir Bely, isar-users
LGTM.

Thanks,
Vijai Kumar K


> --
> 2.20.1
>
> --
> You received this message because you are subscribed to the Google Groups "isar-users" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+...@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20211223113906.29291-1-ubely%40ilbers.de.

Henning Schild

unread,
Jan 4, 2022, 2:54:07 PM1/4/22
to Uladzimir Bely, isar-...@googlegroups.com
This looks like an interface change which might require an entry in the
API changelog.

People fetch these files out of CI and pass them to license clearing,
software asset collection and what not. Changing the filename might
have an impact on how to extract the files and feed them to further
processing.

Henning

Am Thu, 23 Dec 2021 12:39:06 +0100
schrieb Uladzimir Bely <ub...@ilbers.de>:
Reply all
Reply to author
Forward
0 new messages