[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4890/8267] meta-estsdk-toolchain: use WORKDIR instead of D to hold locked-sigs



commit 7ddf8e19c4f9a90710397d785fc992115f8c71bb
Author: Ross Burton <ross burton intel com>
Date:   Thu Mar 2 14:16:05 2017 +0000

    meta-estsdk-toolchain: use WORKDIR instead of D to hold locked-sigs
    
    do_locked_sigs() uses ${D} to hold a file as input to the sstate staging code.
    Generally this isn't a problem as it happens after packaging, but sometimes (if
    the recipe is rebuild, perhaps) do_package() will see the file inside ${D} and
    fail because there is an uninstalled file.
    
    Solve this by using a directory under ${WORKDIR} so it can't be packaged.
    
    (From OE-Core rev: 97056011c17f343e697aa9f0d418f6487b9f7465)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/meta/meta-extsdk-toolchain.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-core/meta/meta-extsdk-toolchain.bb b/meta/recipes-core/meta/meta-extsdk-toolchain.bb
index 0b8fcf0..235d6ec 100644
--- a/meta/recipes-core/meta/meta-extsdk-toolchain.bb
+++ b/meta/recipes-core/meta/meta-extsdk-toolchain.bb
@@ -10,7 +10,7 @@ do_populate_sysroot[deptask] = "do_populate_sysroot"
 # within sstate.bbclass, so if you copy or rename this and expect the same
 # functionality you'll need to modify that as well.
 
-LOCKED_SIGS_INDIR = "${D}/locked-sigs"
+LOCKED_SIGS_INDIR = "${WORKDIR}/locked-sigs"
 
 addtask do_locked_sigs after do_populate_sysroot
 SSTATETASKS += "do_locked_sigs"


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