From 8b80aee29150fcd50b11dedaab42cdec6e3f222b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 1 Feb 2017 11:31:47 +0000 Subject: 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. Signed-off-by: Richard Purdie --- meta/recipes-core/meta/meta-environment.bb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'meta') 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}" inherit cross-canadian -# Need to ensure we have the virtual mappings and site files for all multtilib -# variants -DEPENDS += "${@all_multilib_tune_values(d, 'TOOLCHAIN_NEED_CONFIGSITE_CACHE')}" - do_generate_content[cleandirs] = "${SDK_OUTPUT}" do_generate_content[dirs] = "${SDK_OUTPUT}/${SDKPATH}" +# Need to ensure we have the virtual mappings and site files for all multtilib variants +do_generate_content[depends] = "${@oe.utils.build_depends_string(all_multilib_tune_values(d, 'TOOLCHAIN_NEED_CONFIGSITE_CACHE'), 'do_populate_sysroot')}" python do_generate_content() { # Handle multilibs in the SDK environment, siteconfig, etc files... localdata = bb.data.createCopy(d) @@ -74,6 +72,6 @@ FILES_${PN}= " \ deltask do_fetch deltask do_unpack deltask do_patch -do_configure[noexec] = "1" -do_compile[noexec] = "1" -do_populate_sysroot[noexec] = "1" +deltask do_configure +deltask do_compile +deltask do_populate_sysroot -- cgit 1.2.3-korg