build-appliance-image: Simplify fetch/unpack execution

This provides a slightly neater way of ensuring fetch/unpack get
executed (image.bbclass marks them as noexec) since I found the
current approach harder to understand at first glance.

(From OE-Core rev: 84021fd694d0a7bb1e4f49c0f7c46a0fbd178924)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/images/build-appliance-image.bb b/meta/recipes-core/images/build-appliance-image.bb
index 59ccb98..80cbbec 100644 (file)
--- a/meta/recipes-core/images/build-appliance-image.bb
+++ b/meta/recipes-core/images/build-appliance-image.bb
@@ -68,11 +68,11 @@ fakeroot do_populate_poky_src () {
 
 IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
 
-python do_get_poky_src () {
-    bb.build.exec_func('base_do_fetch', d)
-    bb.build.exec_func('base_do_unpack', d)
+python () {
+       # Ensure we run these usually noexec tasks
+       d.delVarFlag("do_fetch", "noexec")
+       d.delVarFlag("do_unpack", "noexec")
 }
-addtask do_get_poky_src before do_rootfs
 
 create_bundle_files () {
        cd ${WORKDIR}