populate_sdk_base: Extend TOOLCHAIN_TARGET_TASK to include multilib variants

PATCH In review Richard Purdie 2 participants 2 messages Jul 24, 2014

Share & tools

Richard Purdie

author

2014-07-24 21:09 UTC #0 lore raw

PATCH 1/1 populate_sdk_base: Extend TOOLCHAIN_TARGET_TASK to include multilib variants

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 <[email protected]>

meta/classes/populate_sdk_base.bbclass +4 -1

index 0df98db..4b489a6 100644
@@ -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}"

Mark Hatle

Acked-by on v1 1/1

2014-07-24 21:22 UTC #1 lore raw

Quoted 5 lines · Richard Purdie

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 <[email protected]>

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

Acked-by Mark Hatle <[email protected]>

Quoted 18 lines

meta/classes/populate_sdk_base.bbclass +4 -1

index 0df98db..4b489a6 100644
@@ -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}"