summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-12-10 16:56:08 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-10 16:56:08 +0000
commit88ee037741b7e21ff50976a6c5b85278499655ca (patch)
tree6f7408a7e198d33e02f0d297eb6ccb28930033fd
parent2021e2a74f4a8cb2066279e3006087fd3b198bc9 (diff)
downloadopenembedded-core-88ee037741b7e21ff50976a6c5b85278499655ca.tar.gz
openembedded-core-88ee037741b7e21ff50976a6c5b85278499655ca.tar.bz2
openembedded-core-88ee037741b7e21ff50976a6c5b85278499655ca.tar.xz
openembedded-core-88ee037741b7e21ff50976a6c5b85278499655ca.zip
task-cross-canadian: Ensure it reflects TARGET_ARCH in PN
If this recipe doesn't reflect TARGET_ARCH in its name, only one flavour of cross toolchain can be installed at once. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/recipes-core/meta/meta-toolchain.bb2
-rw-r--r--meta/recipes-core/tasks/task-cross-canadian.bb1
3 files changed, 4 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index abd2bb5cf..d3fd26dcf 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 8b62fab6b..40f8d7ea2 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 c32afdcbd..7170faaa9 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"