Patchwork populate_sdk_base: Extend TOOLCHAIN_TARGET_TASK to include multilib variants

login
register
mail settings
Submitter Richard Purdie
Date July 24, 2014, 9:09 p.m.
Message ID <1406236149.27697.16.camel@ted>
Download mbox | patch
Permalink /patch/76635/
State Accepted
Commit d8024434d4c9b6a3400ac494fa3c32d0827e42d3
Headers show

Comments

Richard Purdie - July 24, 2014, 9:09 p.m.
Most people expect the toolchain from a multilib build to contain multilib
components. This change makes that happen and is easy for users to override
should they want something different.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Mark Hatle - July 24, 2014, 9:22 p.m.
On 7/24/14, 4:09 PM, Richard Purdie wrote:
> Most people expect the toolchain from a multilib build to contain multilib
> components. This change makes that happen and is easy for users to override
> should they want something different.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

I tested this (with ipk works, with rpm doesn't work any less then it did before...)

Acked-by: Mark Hatle <mark.hatle@windriver.com>

> diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
> index 0df98db..4b489a6 100644
> --- a/meta/classes/populate_sdk_base.bbclass
> +++ b/meta/classes/populate_sdk_base.bbclass
> @@ -32,7 +32,10 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
>
>   TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-sdk-host packagegroup-cross-canadian-${MACHINE}"
>   TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= ""
> -TOOLCHAIN_TARGET_TASK ?= "packagegroup-core-standalone-sdk-target packagegroup-core-standalone-sdk-target-dbg"
> +TOOLCHAIN_TARGET_TASK ?= " \
> +    ${@multilib_pkg_extend(d, 'packagegroup-core-standalone-sdk-target')} \
> +    ${@multilib_pkg_extend(d, 'packagegroup-core-standalone-sdk-target-dbg')} \
> +    "
>   TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
>   TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}"
>
>
>

Patch

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 0df98db..4b489a6 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -32,7 +32,10 @@  SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
 
 TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-sdk-host packagegroup-cross-canadian-${MACHINE}"
 TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= ""
-TOOLCHAIN_TARGET_TASK ?= "packagegroup-core-standalone-sdk-target packagegroup-core-standalone-sdk-target-dbg"
+TOOLCHAIN_TARGET_TASK ?= " \
+    ${@multilib_pkg_extend(d, 'packagegroup-core-standalone-sdk-target')} \
+    ${@multilib_pkg_extend(d, 'packagegroup-core-standalone-sdk-target-dbg')} \
+    "
 TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
 TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}"