From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7044861119916146688 X-Received: by 2002:a7b:c108:: with SMTP id w8mr1506802wmi.136.1640259549819; Thu, 23 Dec 2021 03:39:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d21b:: with SMTP id j27ls691142wrh.3.gmail; Thu, 23 Dec 2021 03:39:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzB0vxRFkvO2vOWAJckFqyh3Sk94A8icNOXEcwysr1a8Mpql+1tVzqUFSXhh8m2TZ8tuHbE X-Received: by 2002:adf:fac4:: with SMTP id a4mr1477575wrs.66.1640259548810; Thu, 23 Dec 2021 03:39:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640259548; cv=none; d=google.com; s=arc-20160816; b=kxoASEi9YSpQgnUE0mrHMMUZ9W8Lu40XGY9yXhhQcwe8vVFGjcQNNUTId96VjFR2+f qixbaqSaPrKZzAGPLBRqMXtkGwWEGTexGlTcd86e2055wB14/3KEAlqqKBeUznQ22EB9 q5k3bWjAqVpAQY737DRdkGuHIDffD7QajuLa3AF0rlwk9TqAVjr7BzBp9G8PHF35VYy9 prewoerv7r2wRw/G8rgveBcPwz2XPdo7Rp9F2TlKpE1pFza07w1AVcaSNeq0HM8dspyk 3s9zlyjbumuwEm8bydm9loHG+vtdgfzZ3Uk0PbhWjhPqoOiVH8HB8DQm0hNhxVeJqUNI drXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=ZkvPqRSkb58u2r6CSxHlpJtD/e5RYdTESPTlLhFbKI4=; b=O+3BknfVCw9FfDLcFDZjvk1AHXj/pluPpyHJmTpKG9KpKQ1kGfHJnHjoNMbZl8c7Hw ycDmtSNjcm0H81n+CKJJ188xgYmm86p8i3xO6bjWLOi8tCwxLf/Uy4igbyspPKJn3dQR eOK7XUhyn4FBtIaVCGM806DvGSl6qtN1iohY9N41m6o/0EznqouWxS2W0V51G0SeRFH2 s7FXtHRiDP8wrEWCEZftksR0kBwKW7spTrMbqkJwTeOJ99qJIVd+bNpp47rQrBT0+/nf VyZjOOOxxP8jhzg9YaoMhJcl9GykNxGFiPGENcAnNJ6VZJP5eJKo60+ay4dGgGV+TFAc //sA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id f14si36208wmq.2.2021.12.23.03.39.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Dec 2021 03:39:08 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 1BNBd7q0010681 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Dec 2021 12:39:08 +0100 From: Uladzimir Bely 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 Message-Id: <20211223113906.29291-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: d5+M8V99mDoS 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 --- 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