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:23:48 +0000 |
commit | bbc60671ade0bf84d934abb807cdce1f37f76804 (patch) | |
tree | 344a26c1a588cbfae423060142b3079357548082 /meta/classes/image.bbclass | |
parent | 10610aa80ebd07e1d239974bc2b407a7322164c2 (diff) | |
download | poky-bbc60671ade0bf84d934abb807cdce1f37f76804.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.
(From OE-Core rev: cb8b6f7eee4e059bb311330c57068e11bc477366)
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 4 |
1 files changed, 2 insertions, 2 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 () { | |||
252 | 252 | ||
253 | progress_reporter.finish() | 253 | progress_reporter.finish() |
254 | } | 254 | } |
255 | do_rootfs[dirs] = "${TOPDIR}" | 255 | do_rootfs[dirs] = "${IMAGE_ROOTFS} ${IMGDEPLOYDIR} ${TOPDIR}" |
256 | do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR}" | 256 | do_rootfs[cleandirs] += "${IMAGE_ROOTFS} ${IMGDEPLOYDIR} ${S}" |
257 | do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}" | 257 | do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}" |
258 | addtask rootfs after do_prepare_recipe_sysroot | 258 | addtask rootfs after do_prepare_recipe_sysroot |
259 | 259 | ||