From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750639733816164352 X-Received: by 2002:a1c:41c1:: with SMTP id o184mr3331336wma.57.1571755794744; Tue, 22 Oct 2019 07:49:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fa0f:: with SMTP id m15ls4327447wrr.13.gmail; Tue, 22 Oct 2019 07:49:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqzrV9mGehinGeiO9EjpN6iDAi7MueGSu/+J/X3UTuBZxVTXezyKgVM1AVNRW/Hc605u3NGy X-Received: by 2002:a5d:69c8:: with SMTP id s8mr3884083wrw.167.1571755794161; Tue, 22 Oct 2019 07:49:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571755794; cv=none; d=google.com; s=arc-20160816; b=yvfSHUwMdWOUQKN/2WUqZ00U220wmCcRiuFIlvolKoy1YlanPTAXWOKDm2vY9Xo7uR ikGDxzrKM1OSjuJKGs8vJYvKXfpUH0f5lzy2P18ij/81Zx/0uZ+Bz73fl/3Uyu552Tvt RkIusT1sz11IMZdrbeSiNBkqEiiBT37QM1XMqqg1FaUgQPNQ9rsJf3jIM6uSPwMynj5T BYHHwqFNA+Wpomqb8PVbzVG1m7uDSpDTpilKbg4no2TdOyvYUnNWZZO0aoXiTdYWd82i wveYMEi+Hn6vVd4JJy9IjaXIbGEr1Hx8DXLhaSfqT0J+wDejEKgCpPgCjn/s7XcnWkDa MwLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=fhaNp6FP+vNQkYjQXRP7sPP7Na9rmmW+NJpqFocUFMQ=; b=fTWQ8nIoDP5vmJRiwg3ji4TucAT/9k18bREzFSKINOjJCM7nf3KsaWLey9EWa9rmpD X8T0eWC24Bt2ug6VdIRht4njnvb4KNM210alhfCQt9WTF0ieO201bHc9eYK/exwNIKvp 65u8H+7tcaNFk8AmcVZXwI/M/lR+UnMiTXl9JpufNVWuvZa87kbljqwMMXyMCdAPDSip wcnrQZd/pmdWs4P0Jq42cpP475fb86TDzxXvnISNyVELgVtFouHtJQYp4u9V9aq9coBC fSFdpk9Pd79Knj0ckLJT2mYhtR+uPvOypHWUEONaVlYNttaDauIEbtjfxZeIbAzJ7Ld4 Iezg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bV7IU1XP; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::442 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-wr1-x442.google.com (mail-wr1-x442.google.com. [2a00:1450:4864:20::442]) by gmr-mx.google.com with ESMTPS id w2si869555wrn.4.2019.10.22.07.49.54 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 22 Oct 2019 07:49:54 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::442 as permitted sender) client-ip=2a00:1450:4864:20::442; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bV7IU1XP; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::442 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wr1-x442.google.com with SMTP id l10so17997939wrb.2 for ; Tue, 22 Oct 2019 07:49:54 -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; bh=fhaNp6FP+vNQkYjQXRP7sPP7Na9rmmW+NJpqFocUFMQ=; b=bV7IU1XP5wyflaPK8jMCV4wnkpsN0LgVFheHYh/46b9aPXwbiV5RUYjyJuudkRzoCX VYqN0Pyt8R+B7Hrk7RQvC6s3VmBZC2qascM0e/gJOhpQ1X2xwGenKSVtgD9pCrBbydIj b0N5nbMyzimDRckgMZNuLZ/NZulTkfBMzYOtuIu20y/aghxTfkVV5XAV47UCBaEvsDqx GUFQnNrv8YyVsETMPshry25it/jahQx2RkafKr87r7K5toSbIGlqD7ZsVmZFCedq2EgW OpcjUllgCMyB4PGa4rK71OzWnqI9TTaavoPHQEMkq/4pe72zlTonxykFJAtkUMp+cHKx cPTg== 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; bh=fhaNp6FP+vNQkYjQXRP7sPP7Na9rmmW+NJpqFocUFMQ=; b=AQK+V5Rh2TuOIGJaTxUWcuOKeumm1rNGk6dbvE7Xvdwys1+uYafJscto0vMiU+We3a D8tHTi4CLOI/BwULGj7Gc4b7mTnkWyylfMQQLluMsnvnOEr3liIaegstCyv9uq5XP2pZ B69+FUVI0vWKr89a06QXKv8LGKevVEIZMHNT5CC59wBmux9dWADsfsTSdO5lDLMrGEfc T7qeH5zd7j48ODHyomRbx3MbHx68ULdosJYCF6+c+o09LNz8Z2VKoPNUG7lxH3BPdHvo l5YJrrtbamrApVCmzBARVWNtYTY108uF3i7PJBAl5Cb+n77D0uL25wOwqRWYEQvLcMJK tnGA== X-Gm-Message-State: APjAAAXa6rOzP3AluMw83x7UrQ0NmvwgqssXtN3wCS3tM2QQtmNv287p qlXV6wJ7mQJIqO3CjIJhWsbavgOXXks= X-Received: by 2002:a5d:6787:: with SMTP id v7mr4031489wru.392.1571755793425; Tue, 22 Oct 2019 07:49:53 -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 z9sm18352845wrv.1.2019.10.22.07.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 07:49:52 -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] Fix manifest generation Date: Tue, 22 Oct 2019 20:19:30 +0530 Message-Id: <20191022144930.3458-1-Vijaikumar_Kangarajan@mentor.com> X-Mailer: git-send-email 2.17.1 X-TUID: 0xr84hCSAFN+ 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 --- 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