From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750639733816164352 X-Received: by 2002:a17:906:948d:: with SMTP id t13mr28234928ejx.112.1571756023610; Tue, 22 Oct 2019 07:53:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:7d5:: with SMTP id u21ls2068215edy.14.gmail; Tue, 22 Oct 2019 07:53:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqw2I3LOAuT4/O+Wq9zpx43PKmWSmsMFxiAdsAId/pzKPIhaVwhGOeQu/Q6lMtYskj6uT16E X-Received: by 2002:a50:f40c:: with SMTP id r12mr8302821edm.50.1571756023182; Tue, 22 Oct 2019 07:53:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571756023; cv=none; d=google.com; s=arc-20160816; b=039p5S7R5H94d6Rr5qgdR2dWpJTvZp3la1ZuMklqn8gvCU4Jo8EasaTNBTnQcp0wBH QXE6T/MFq4HrCezo1mcn2p0O0Zx+WuSEiO8FKDG/g9maMlRUGrNyI814JXmbvPuX6Wo+ Knfs1FXSAR6FWG8vNeinhFG3HHf/7uzeEMOjGE7ojX6nYPQaZumPG3o5MAZ7mEUSTQgW Vg4qwkvzD0dptheis+EFIqx+NbTA0rKhokkcyWAdGzjGL8BzuZs/wnnlydq6/aEDFl9r WOOQS/MYpDImacr5qbLyW2L63bVDe5KIDTKILNYxtXH8U5r5JuatU5RYBWhmcdFUYBN3 dVRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EIaH4/VIHujx/0PZ26FBNl3nBF5HqRS1OucXnjkN9uI=; b=VRurPLHIromv+XcNeq5PXxiOE2JKr9Dbd0df7wNGDrJxX6lhzqC0Rn4YH1O/hwEbPk W2jrxg4b9Wr1YvjgqBMTuAeq8mc7B4+dz8rie1qkmg1GJJsIqXEjL1iDV9XMViFHpQpJ B9SBx6Extz+UUnSF4YX0FGIBXIrPGuCR7wg5vZa0OtCOYR7l3RsxgUFoz72Pe4lmdYH/ lXgfdt4ZzoGMeYjZl/lNuBeWhbO2j+5ZZc/pAYbpYye6V461NazzrveXUaJVHh9jpari mIClxlqZtEsg9GUWDaY/x5zPPIr16CbS1wRJLmz2w/J0nfm08v8j5Q5Z2i9Wje8bx0v+ YYmA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=KFt4OGLE; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::341 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com. [2a00:1450:4864:20::341]) by gmr-mx.google.com with ESMTPS id z18si772674edd.5.2019.10.22.07.53.43 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 22 Oct 2019 07:53:43 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::341 as permitted sender) client-ip=2a00:1450:4864:20::341; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=KFt4OGLE; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::341 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wm1-x341.google.com with SMTP id q13so7596094wmj.0 for ; Tue, 22 Oct 2019 07:53:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EIaH4/VIHujx/0PZ26FBNl3nBF5HqRS1OucXnjkN9uI=; b=KFt4OGLEFJgHbmPNOsITjDibbRBMpN3ljJnzfqkuv639FDnUx2IVX/rASTecbuYncL qJUL4tBgJBx4r2338K8mOkvHEaeRn23aKR9ffBle9csSkfjCpJu7p28twRT+N9NxD255 GvrPIpxkqyAvASvnjD65O2LAxZJww/o0faiNfnp+PxaPyTiS0QV+c4tXb3mqpZRhedsy jEKDVZD4qVmTvLHwoOgJtrqKW6YUMx2ylNKD5x7b5KuM7QDPDp8bkL+qpNiF8cMXwxum +FMRdcWTU9zeyhnRtZ6nkN8OD18c/bzCNrUKA64P8wPpKw9kLkszwCeo3USzmQWh+5SW 4l+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EIaH4/VIHujx/0PZ26FBNl3nBF5HqRS1OucXnjkN9uI=; b=QiLsSW+/X7uBjjvsb7HHJFRWXRaY0JDHvxhj7Xjcd+dStK5e5Y+pLp6GtrYJkU4Gig daWjAV7lHRy0RLyWV/ZIokeRmtDKAeyJL3hK1elQ8TrbM5+h+abizoPe84HZo/kIe661 i6NkyupjdzpqQ95+sc5NsnEBTjetfto9inNooZR3EeYrYYlUCu1dQwg6lYzmNvzNbf8f HPb30pYNqxZoxjoqnOca3ng6NpiIVDETXPMOS2D/9dD7aJB2Z/odoXE0JlAChsZtmSHD hE2UTSgvpbkVOSRXxlAS5vVM0gvuOerdN6ZEvsP6asmmiEIfJcrAbVdKLCwtk2ZgtES7 my+g== X-Gm-Message-State: APjAAAX6HiTRFjB0TB99C50aRvf6uD0jEIIOSWmBiPLWeliFSS7TMeFe rNce+EY17fjbkH+9rIJ7G7olr6fvnXc= X-Received: by 2002:a1c:9894:: with SMTP id a142mr3331242wme.70.1571756022566; Tue, 22 Oct 2019 07:53:42 -0700 (PDT) Return-Path: Received: from lightning.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id 79sm27282335wmb.7.2019.10.22.07.53.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 07:53:42 -0700 (PDT) From: vijaikumar.kanagarajan@gmail.com X-Google-Original-From: Vijaikumar_Kangarajan@mentor.com To: isar-users@googlegroups.com Cc: Vijai Kumar K Subject: [PATCH v2] meta: rootfs: Fix manifest generation Date: Tue, 22 Oct 2019 20:23:36 +0530 Message-Id: <20191022145336.3873-1-Vijaikumar_Kangarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191022144930.3458-1-Vijaikumar_Kangarajan@mentor.com> References: <20191022144930.3458-1-Vijaikumar_Kangarajan@mentor.com> X-TUID: Yr3IbB279gXi From: Vijai Kumar K finalize-rootfs task removes qemu-*-static. It is needed for rootfs_generate_manifest to work when HOST_ARCH != DISTRO_ARCH. Make sure a proper chroot environment is available when generating manifest. Signed-off-by: Vijai Kumar K --- Changes in v2: - Updated commit message. meta/classes/rootfs.bbclass | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index da66b3f..1da27ff 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -9,8 +9,8 @@ ROOTFS_PACKAGES ?= "" # available features are: # 'deploy-package-cache' - copy the package cache ${WORKDIR}/apt_cache # 'clean-package-cache' - delete package cache from rootfs -# 'finalize-rootfs' - delete files needed to chroot into the rootfs # 'generate-manifest' - generate a package manifest of the rootfs into ${ROOTFS_MANIFEST_DEPLOY_DIR} +# 'finalize-rootfs' - delete files needed to chroot into the rootfs ROOTFS_FEATURES ?= "" ROOTFS_APT_ARGS="install --yes -o Debug::pkgProblemResolver=yes" @@ -185,6 +185,15 @@ rootfs_postprocess_clean_package_cache() { sudo rm -rf "${ROOTFSDIR}/var/lib/apt/lists/"* } +ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'generate-manifest', 'rootfs_generate_manifest', '', d)}" +rootfs_generate_manifest () { + mkdir -p ${ROOTFS_MANIFEST_DEPLOY_DIR} + 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_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'finalize-rootfs', 'rootfs_postprocess_finalize', '', d)}" rootfs_postprocess_finalize() { sudo -s <<'EOSUDO' @@ -223,15 +232,6 @@ rootfs_postprocess_finalize() { EOSUDO } -ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'generate-manifest', 'rootfs_generate_manifest', '', d)}" -rootfs_generate_manifest () { - mkdir -p ${ROOTFS_MANIFEST_DEPLOY_DIR} - 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 -} - do_rootfs_postprocess[vardeps] = "${ROOTFS_POSTPROCESS_COMMAND}" python do_rootfs_postprocess() { # Take care that its correctly mounted: -- 2.17.1