meta: handle IMAGE_ROOTFS/IMGDEPLOYDIR by task varflags
PATCH v2 1/1 meta: handle IMAGE_ROOTFS/IMGDEPLOYDIR by task varflags
From: Ming Liu <[email protected]>
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.
--- meta/classes/image.bbclass | 4 ++-- meta/lib/oe/rootfs.py | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-)
meta/classes/image.bbclass +2 -2
@@ -251,8 +251,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] += "${S} ${IMGDEPLOYDIR} ${@["${IMAGE_ROOTFS}", ""][(d.getVar('INC_RPM_IMAGE_GEN') == '1')]}" do_rootfs[umask] = "022" do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}" addtask rootfs after do_prepare_recipe_sysroot
meta/lib/oe/rootfs.py +0 -5
@@ -19,7 +19,6 @@ class Rootfs(object, metaclass=ABCMeta): self.d = d self.pm = None self.image_rootfs = self.d.getVar('IMAGE_ROOTFS') - self.deploydir = self.d.getVar('IMGDEPLOYDIR') self.progress_reporter = progress_reporter self.logcatcher = logcatcher
@@ -188,10 +187,6 @@ class Rootfs(object, metaclass=ABCMeta): post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND") rootfs_post_install_cmds = self.d.getVar('ROOTFS_POSTINSTALL_COMMAND') - bb.utils.mkdirhier(self.image_rootfs) - - bb.utils.mkdirhier(self.deploydir) - execute_pre_post_process(self.d, pre_process_cmds) if self.progress_reporter:
Signature · 1 line
2.7.4
Quoted 13 lines · On Sun, 2019-01-06 at 17:30 +0100, [email protected] wrote:
From: Ming Liu <[email protected]>
I found a issue that sometimes there are leftovers in
IMAGE_ROOTFSthat are generated by the previous builds. I think this is caused byIMAGE_ROOTFSis not in do_rootfs[cleandirs], so add it in provided thatINC_RPM_IMAGE_GENis not set.IMGDEPLOYDIR could be added to do_rootfs[dirs] as well, hence some code
inrootfs.pyto generate the IMAGE_ROOTFS/IMGDEPLOYDIR directories could be removed.
Quoted 5 lines
Signed-off-by Ming Liu <[email protected]>--- 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
HI, Richard:
Will send a V2 to do the cleaning up firstly, after I double checked the code, seems to me that you are correct, there are "bb.utils.remove(self.image_rootfs, True)" for all package backend, so I am wondering why I saw the leftovers, will investigate that.
//Ming Liu
Richard Purdie <[email protected]> 於 2019年1月7日 週一 下午4:33寫道:
Quoted 41 lines · On Sun, 2019-01-06 at 17:30 +0100, [email protected] wrote:
Quoted 13 lines
From: Ming Liu <[email protected]>
I found a issue that sometimes there are leftovers in
IMAGE_ROOTFSthat are generated by the previous builds. I think this is caused byIMAGE_ROOTFSis not in do_rootfs[cleandirs], so add it in provided thatINC_RPM_IMAGE_GENis not set.IMGDEPLOYDIR could be added to do_rootfs[dirs] as well, hence some code
inrootfs.pyto generate the IMAGE_ROOTFS/IMGDEPLOYDIR directories could be removed.Quoted 5 lines
Signed-off-by Ming Liu <[email protected]>--- 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_GENfor example so the logic would need to become more twisted. Looking at the code inlib/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
Quoted 31 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of [email protected]
Sent: den 6 januari 2019 17:31
To: [email protected]
Cc: Ming Liu <[email protected]>
Subject: [OE-core] [PATCH V2] meta: handle IMAGE_ROOTFS/IMGDEPLOYDIR by task varflagsFrom: Ming Liu <[email protected]>
I found a issue that sometimes there are leftovers in
IMAGE_ROOTFSthat are generated by the previous builds. I think this is caused byIMAGE_ROOTFSis not in do_rootfs[cleandirs], so add it in provided thatINC_RPM_IMAGE_GENis not set.IMGDEPLOYDIR could be added to do_rootfs[dirs] as well, hence some code in
rootfs.pyto generate the IMAGE_ROOTFS/IMGDEPLOYDIR directories could be removed.Signed-off-by Ming Liu <[email protected]>--- meta/classes/image.bbclass | 4 ++-- meta/lib/oe/rootfs.py | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-)meta/classes/image.bbclass +0
-0
meta/classes/image.bbclass fakeroot python do_rootfs () { · line 255
Quoted 7 lines
meta/classes/image.bbclass +2
-2@@ -251,8 +251,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] += "${S} ${IMGDEPLOYDIR} ${@["${IMAGE_ROOTFS}", ""][(d.getVar('INC_RPM_IMAGE_GEN') == '1')]}"
A bit more readable:
do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR} ${@'${IMAGE_ROOTFS}' if d.getVar('INC_RPM_IMAGE_GEN') != '1' else ''}"
Quoted 27 lines
meta/classes/image.bbclass +0
-0do_rootfs[umask] = "022" do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}" addtask rootfs after do_prepare_recipe_sysrootmeta/lib/oe/rootfs.py +0
-6@@ -19,7 +19,6 @@ class Rootfs(object, metaclass=ABCMeta): self.d = d self.pm = None self.image_rootfs = self.d.getVar('IMAGE_ROOTFS') - self.deploydir = self.d.getVar('IMGDEPLOYDIR') self.progress_reporter = progress_reporter self.logcatcher = logcatcher@@ -188,10 +187,6 @@ class Rootfs(object, metaclass=ABCMeta): post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND") rootfs_post_install_cmds = self.d.getVar('ROOTFS_POSTINSTALL_COMMAND') - bb.utils.mkdirhier(self.image_rootfs) - - bb.utils.mkdirhier(self.deploydir) - execute_pre_post_process(self.d, pre_process_cmds) if self.progress_reporter: --
Quoted 1 line
2.7.4
//Peter