diff options
| author |   Ming Liu <liu.ming50@gmail.com> | 2022-03-12 12:53:03 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-13 12:22:43 +0000 |
| commit | cb8b6f7eee4e059bb311330c57068e11bc477366 (patch) | |
| tree | ff99d4709076023646a54041a9c17e7043e39f28 | |
| parent | 9f741f8097b2098d393da1acb42836b59cff069b (diff) | |
| download | openembedded-core-contrib-cb8b6f7eee4e059bb311330c57068e11bc477366.tar.gz | |
image.bbclass: make sure do_rootfs run from a clean workspace
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.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image.bbclass | 4 | ||||
| -rw-r--r-- | 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..eb192057c2 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} ${S}" do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}" addtask rootfs after do_prepare_recipe_sysroot diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index b0dd625539..98cf3f244d 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -190,10 +190,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: |