public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH] meta: Fix conflicting name of image manifest and dpkg_status
Date: Thu, 23 Dec 2021 12:39:06 +0100	[thread overview]
Message-ID: <20211223113906.29291-1-ubely@ilbers.de> (raw)

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 <ubely@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


             reply	other threads:[~2021-12-23 11:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-23 11:39 Uladzimir Bely [this message]
2021-12-23 13:31 ` vijai kumar
2022-01-04 19:54 ` Henning Schild

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=20211223113906.29291-1-ubely@ilbers.de \
    --to=ubely@ilbers.de \
    --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