summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-01 11:31:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-01 18:02:12 (GMT)
commit8343ed93c4278715aa1582d3cadedf8f197b4089 (patch)
treed422581c863841d317f9206dc7e88fbd99630b44
parent85e9af9d78757e992f0d91da5909fb59d1591ebe (diff)
downloadpoky-8343ed93c4278715aa1582d3cadedf8f197b4089.tar.gz
meta-environment: Clean up the task structure to reduce manifest warnings
This puts the dependencies on the correct task and removes pointless noexec tasks allowing for a slightly cleaner task structure. (From OE-Core rev: 8b80aee29150fcd50b11dedaab42cdec6e3f222b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/meta/meta-environment.bb12
1 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index 1128a56..c7ac05d 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -19,12 +19,10 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
19 19
20inherit cross-canadian 20inherit cross-canadian
21 21
22# Need to ensure we have the virtual mappings and site files for all multtilib
23# variants
24DEPENDS += "${@all_multilib_tune_values(d, 'TOOLCHAIN_NEED_CONFIGSITE_CACHE')}"
25
26do_generate_content[cleandirs] = "${SDK_OUTPUT}" 22do_generate_content[cleandirs] = "${SDK_OUTPUT}"
27do_generate_content[dirs] = "${SDK_OUTPUT}/${SDKPATH}" 23do_generate_content[dirs] = "${SDK_OUTPUT}/${SDKPATH}"
24# Need to ensure we have the virtual mappings and site files for all multtilib variants
25do_generate_content[depends] = "${@oe.utils.build_depends_string(all_multilib_tune_values(d, 'TOOLCHAIN_NEED_CONFIGSITE_CACHE'), 'do_populate_sysroot')}"
28python do_generate_content() { 26python do_generate_content() {
29 # Handle multilibs in the SDK environment, siteconfig, etc files... 27 # Handle multilibs in the SDK environment, siteconfig, etc files...
30 localdata = bb.data.createCopy(d) 28 localdata = bb.data.createCopy(d)
@@ -74,6 +72,6 @@ FILES_${PN}= " \
74deltask do_fetch 72deltask do_fetch
75deltask do_unpack 73deltask do_unpack
76deltask do_patch 74deltask do_patch
77do_configure[noexec] = "1" 75deltask do_configure
78do_compile[noexec] = "1" 76deltask do_compile
79do_populate_sysroot[noexec] = "1" 77deltask do_populate_sysroot