diff options
| -rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | meta/recipes-core/meta/meta-toolchain.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/tasks/task-cross-canadian.bb | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index abd2bb5cfa..d3fd26dcfb 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -726,3 +726,5 @@ TARGET_ARCH[unexport] = "1" # (breaks sysvinit at least) DISTRO[unexport] = "1" +# Used by canadian-cross to handle string conversions on TARGET_ARCH where needed +TRANSLATED_TARGET_ARCH ??= ${TARGET_ARCH} diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb index 8b62fab6bd..40f8d7ea26 100644 --- a/meta/recipes-core/meta/meta-toolchain.bb +++ b/meta/recipes-core/meta/meta-toolchain.bb @@ -13,7 +13,7 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}" IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}" IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${SDKTARGETSYSROOT}" -TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian" +TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target task-poky-standalone-sdk-target-dbg" TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}" diff --git a/meta/recipes-core/tasks/task-cross-canadian.bb b/meta/recipes-core/tasks/task-cross-canadian.bb index c32afdcbd2..7170faaa96 100644 --- a/meta/recipes-core/tasks/task-cross-canadian.bb +++ b/meta/recipes-core/tasks/task-cross-canadian.bb @@ -1,4 +1,5 @@ DESCRIPTION = "Host SDK package for cross canadian toolchain" +PN = "task-cross-canadian-${TRANSLATED_TARGET_ARCH}" PR = "r0" LICENSE = "MIT" ALLOW_EMPTY = "1" |