[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7047/8267] image: Drop before do_build from do_rootfs and do_image



commit 7b37b0ac071e84bb369266efd12976c1637a2917
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Sun Jul 30 16:04:54 2017 +0100

    image: Drop before do_build from do_rootfs and do_image
    
    do_image_complete has the do_build dependency, these other two tasks
    don't need it. If this is present, it complicates the dependency tree
    and convinces rm_work that the tasks need to rerun even if they
    already did since the stamps are removed.
    
    Drop the unneeded dependency to help resolve this issue.
    
    (From OE-Core rev: f61bcae0926a1ad79032119cc5656c0e862b13af)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 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 40bd614..0885fdb 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -261,7 +261,7 @@ fakeroot python do_rootfs () {
 do_rootfs[dirs] = "${TOPDIR}"
 do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR}"
 do_rootfs[umask] = "022"
-addtask rootfs before do_build after do_prepare_recipe_sysroot
+addtask rootfs after do_prepare_recipe_sysroot
 
 fakeroot python do_image () {
     from oe.utils import execute_pre_post_process
@@ -272,7 +272,7 @@ fakeroot python do_image () {
 }
 do_image[dirs] = "${TOPDIR}"
 do_image[umask] = "022"
-addtask do_image after do_rootfs before do_build
+addtask do_image after do_rootfs
 
 fakeroot python do_image_complete () {
     from oe.utils import execute_pre_post_process


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]