Skip to contentSkip to conversation

meta: clean up IMAGE_ROOTFS/IMGDEPLOYDIR creation code

PATCH New [email protected] 1 participant 1 message Jan 9, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meta: clean up IMAGE_ROOTFS/IMGDEPLOYDIR creation code

From: Ming Liu <[email protected]>

It is not necessary to create IMAGE_ROOTFS/IMGDEPLOYDIR in rootfs.py, they could be handled by do_rootfs[dirs], in a cleaner way.

---
 meta/classes/image.bbclass | 2 +-
 meta/lib/oe/rootfs.py      | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)
meta/classes/image.bbclass +1 -1
index 11927f3..7f447d0 100644
@@ -251,7 +251,7 @@ fakeroot python do_rootfs () {
 
     progress_reporter.finish()
 }
-do_rootfs[dirs] = "${TOPDIR}"
+do_rootfs[dirs] = "${IMAGE_ROOTFS} ${IMGDEPLOYDIR} ${TOPDIR}"
 do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR}"
 do_rootfs[umask] = "022"
 do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}"
meta/lib/oe/rootfs.py +0 -5
index 4273891..945c769 100644
@@ -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