[OE-core] [PATCH V2] meta: handle IMAGE_ROOTFS/IMGDEPLOYDIR by task varflags

Richard Purdie richard.purdie at linuxfoundation.org
Mon Jan 7 15:33:00 UTC 2019


On Sun, 2019-01-06 at 17:30 +0100, liu.ming50 at gmail.com wrote:
> From: Ming Liu <liu.ming50 at gmail.com>
> 
> I found a issue that sometimes there are leftovers in IMAGE_ROOTFS
> that are generated by the previous builds. I think this is caused by
> IMAGE_ROOTFS is not in do_rootfs[cleandirs], so add it in provided
> that
> INC_RPM_IMAGE_GEN is not set.
> 
> IMGDEPLOYDIR could be added to do_rootfs[dirs] as well, hence some
> code
> in rootfs.py to generate the IMAGE_ROOTFS/IMGDEPLOYDIR directories
> could be removed.
> 
> Signed-off-by: Ming Liu <liu.ming50 at gmail.com>
> ---
>  meta/classes/image.bbclass | 4 ++--
>  meta/lib/oe/rootfs.py      | 5 -----
>  2 files changed, 2 insertions(+), 7 deletions(-)

Firstly, lets split the patch into two, the cleanup and the "fix".

The cleanup is fine. The fix is more problematic as I don't want to
start encoding logic into the cleandirs var flag. You've missed
INC_IPK_IMAGE_GEN for example so the logic would need to become more
twisted. Looking at the code in lib/oe/rootfs.py, it does cleanup the
directory:

        self.inc_rpm_image_gen = self.d.getVar('INC_RPM_IMAGE_GEN')
        if self.inc_rpm_image_gen != "1":
            bb.utils.remove(self.image_rootfs, True)
        else:
            self.pm.recovery_packaging_data()

so I'm not sure this will fix the issue you're seeing anyway.

Cheers,

Richard



More information about the Openembedded-core mailing list