diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-01 11:31:47 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-01 18:02:12 +0000 |
commit | 8343ed93c4278715aa1582d3cadedf8f197b4089 (patch) | |
tree | d422581c863841d317f9206dc7e88fbd99630b44 | |
parent | 85e9af9d78757e992f0d91da5909fb59d1591ebe (diff) | |
download | poky-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.bb | 12 |
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 1128a56c1e..c7ac05d62a 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 | ||
20 | inherit cross-canadian | 20 | inherit cross-canadian |
21 | 21 | ||
22 | # Need to ensure we have the virtual mappings and site files for all multtilib | ||
23 | # variants | ||
24 | DEPENDS += "${@all_multilib_tune_values(d, 'TOOLCHAIN_NEED_CONFIGSITE_CACHE')}" | ||
25 | |||
26 | do_generate_content[cleandirs] = "${SDK_OUTPUT}" | 22 | do_generate_content[cleandirs] = "${SDK_OUTPUT}" |
27 | do_generate_content[dirs] = "${SDK_OUTPUT}/${SDKPATH}" | 23 | do_generate_content[dirs] = "${SDK_OUTPUT}/${SDKPATH}" |
24 | # Need to ensure we have the virtual mappings and site files for all multtilib variants | ||
25 | do_generate_content[depends] = "${@oe.utils.build_depends_string(all_multilib_tune_values(d, 'TOOLCHAIN_NEED_CONFIGSITE_CACHE'), 'do_populate_sysroot')}" | ||
28 | python do_generate_content() { | 26 | python 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}= " \ | |||
74 | deltask do_fetch | 72 | deltask do_fetch |
75 | deltask do_unpack | 73 | deltask do_unpack |
76 | deltask do_patch | 74 | deltask do_patch |
77 | do_configure[noexec] = "1" | 75 | deltask do_configure |
78 | do_compile[noexec] = "1" | 76 | deltask do_compile |
79 | do_populate_sysroot[noexec] = "1" | 77 | deltask do_populate_sysroot |