[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4446/8267] wic-tools: Do not remove sysroot with rm_work, because wic needs it.



commit 47be19240f90297516156741d6e5f5ddfe0b9da5
Author: Kristian Amlie <kristian amlie mender io>
Date:   Mon Jan 30 16:43:38 2017 +0100

    wic-tools: Do not remove sysroot with rm_work, because wic needs it.
    
    The sysroot of wic-tools is needed for wic, but if rm_work is enabled,
    it will be removed before wic has a chance to use it, hence this fix.
    
    (From OE-Core rev: fc59d35a8ceae6302e0a161bab04829fdfd157cd)
    
    Signed-off-by: Kristian Amlie <kristian amlie mender io>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/meta/wic-tools.bb |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb
index 1d9ea9c..bd4319a 100644
--- a/meta/recipes-core/meta/wic-tools.bb
+++ b/meta/recipes-core/meta/wic-tools.bb
@@ -9,6 +9,10 @@ DEPENDS_append_x86-64 = " syslinux grub-efi systemd-boot"
 INHIBIT_DEFAULT_DEPS = "1"
 inherit nopackages
 
+# The sysroot of wic-tools is needed for wic, but if rm_work is enabled, it will
+# be removed before wic has a chance to use it, hence the exclusion below.
+RM_WORK_EXCLUDE += "${PN}"
+
 python do_build_sysroot () {
     bb.build.exec_func("extend_recipe_sysroot", d)
 


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