From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun, 28 Feb 2016 08:57:20 +0000 (+0000)
Subject: image: Run do_rootfs_wicenv after do_image
X-Git-Tag: yocto-4.0~22398
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f5429b5e543e122072a51b518cc137dfc8ec442;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

image: Run do_rootfs_wicenv after do_image

do_image can modify the content of the rootfs directory so we need to run
do_rootfs_wicenv after do_image compeltes or the command can fail.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 5924dedf9e4..02612ad2a23 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -275,7 +275,7 @@ python do_rootfs_wicenv () {
             if value:
                 envf.write('%s="%s"\n' % (var, value.strip()))
 }
-addtask do_rootfs_wicenv after do_rootfs before do_image_wic do_image_complete
+addtask do_rootfs_wicenv after do_image before do_image_wic do_image_complete
 do_rootfs_wicenv[vardeps] += "${WICVARS}"
 do_rootfs_wicenv[prefuncs] = 'set_image_size'