]> code.ossystems Code Review - openembedded-core.git/commitdiff
meta-estsdk-toolchain: use WORKDIR instead of D to hold locked-sigs
authorRoss Burton <ross.burton@intel.com>
Thu, 2 Mar 2017 14:16:05 +0000 (14:16 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 2 Mar 2017 14:21:05 +0000 (14:21 +0000)
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.

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

index 0b8fcf08dc6cf9c146f3c2d62a7de78089052720..235d6ecc0f4f6662785206f53e4468ac6912d026 100644 (file)
@@ -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"