diff options
author | Ross Burton <ross.burton@intel.com> | 2017-03-02 14:16:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-02 14:21:12 +0000 |
commit | 7ddf8e19c4f9a90710397d785fc992115f8c71bb (patch) | |
tree | e6d44d2697daafd83b8df457b359add47639d3d8 /meta/recipes-core | |
parent | e77712ee028b1946ab2268737499640452f7ac6f (diff) | |
download | poky-7ddf8e19c4f9a90710397d785fc992115f8c71bb.tar.gz |
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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | 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 0b8fcf08dc..235d6ecc0f 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" | |||
10 | # within sstate.bbclass, so if you copy or rename this and expect the same | 10 | # within sstate.bbclass, so if you copy or rename this and expect the same |
11 | # functionality you'll need to modify that as well. | 11 | # functionality you'll need to modify that as well. |
12 | 12 | ||
13 | LOCKED_SIGS_INDIR = "${D}/locked-sigs" | 13 | LOCKED_SIGS_INDIR = "${WORKDIR}/locked-sigs" |
14 | 14 | ||
15 | addtask do_locked_sigs after do_populate_sysroot | 15 | addtask do_locked_sigs after do_populate_sysroot |
16 | SSTATETASKS += "do_locked_sigs" | 16 | SSTATETASKS += "do_locked_sigs" |