On Sat, 2022-03-12 at 16:22 +0000, Richard Purdie via lists.openembedded.org wrote: > On Sat, 2022-03-12 at 12:53 +0100, Ming Liu wrote: > > From: Ming Liu <[email protected]> > > > > Add ${IMAGE_ROOTFS} and ${IMGDEPLOYDIR} to do_rootfs[dirs] and > > do_rootfs[cleandirs], this ensures do_rootfs run from a clean > > workspace, with this change, we can now remove two bb.utils.mkdirhier > > lines from meta/lib/oe/rootfs.py. > > > > Also drop ${S} from do_rootfs[cleandirs], nothing being installed into > > that directory. > > > > Signed-off-by: Ming Liu <[email protected]> > > --- > > meta/classes/image.bbclass | 4 ++-- > > meta/lib/oe/rootfs.py | 4 ---- > > 2 files changed, 2 insertions(+), 6 deletions(-) > > > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > > index 2b0ce4a988..98a0555040 100644 > > --- a/meta/classes/image.bbclass > > +++ b/meta/classes/image.bbclass > > @@ -252,8 +252,8 @@ fakeroot python do_rootfs () { > > > > progress_reporter.finish() > > } > > -do_rootfs[dirs] = "${TOPDIR}" > > -do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR}" > > +do_rootfs[dirs] = "${IMAGE_ROOTFS} ${IMGDEPLOYDIR} ${TOPDIR}" > > +do_rootfs[cleandirs] += "${IMAGE_ROOTFS} ${IMGDEPLOYDIR}" > > do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}" > > addtask rootfs after do_prepare_recipe_sysroot > > I think the removal of ${S} breaks things: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/3279/steps/14/logs/stdio
FWIW I've dropped that piece of the patch and merged. Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163107): https://lists.openembedded.org/g/openembedded-core/message/163107 Mute This Topic: https://lists.openembedded.org/mt/89730153/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
