Re: [PATCH v2] meta: rootfs: Fix manifest generation

[Vijai Kumar K <vijaikumar.kanagarajan@gmail.com>]

On Tue, Oct 22, 2019 at 06:28:57PM +0200, Gylstorff Quirin wrote:
> 
> 
> On 10/22/19 4:53 PM, vijaikumar.kanagarajan@gmail.com wrote:
> > From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> > 
> > 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 <Vijaikumar_Kanagarajan@mentor.com>
> > ---
> > 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
> >   }
> 
> Is it possible to add a guard to finalize to check that it is the last
> command in ROOTFS_POSTPROCESS_COMMAND.

We could use _append instead of += for finalize-rootfs. May be add a comment as well to warn developers
that any postprocess function that needs chroot should go before finalize-rootfs.

Thanks,
Vijai Kumar K

> 
> > -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:
> > 
> 
> Thanks.
> 
> This should have been found in the CI build.
> Is the CrossBuild not part of the CI configuration?
> 
> Quirin
> 
> -- 
> 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+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/28666b08-fc78-8ad3-083b-f94a345b98ce%40siemens.com.