summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2010-12-06 17:45:45 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-10 15:36:48 +0000
commit2021e2a74f4a8cb2066279e3006087fd3b198bc9 (patch)
tree4ab220a34e77407e5eb6001b9a0b07bfdbde3d40
parent322d6ab29902a51bd46303a4aed9f2b0b63cdb44 (diff)
downloadpoky-2021e2a74f4a8cb2066279e3006087fd3b198bc9.tar.gz
Using TRANSLATED_TARGET_ARCH instead of TARGET_ARCH.
Using TRANSLATED_TARGET_ARCH instead of TARGET_ARCH for cross-canadian packages. This is due to the TARGET_ARCH of x86_64 would results incorrect packaging in cross-canadian packages. The pacakge name appendix of x86_64 target in cross-canadian packages is x86-64. Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
-rw-r--r--meta/classes/cross-canadian.bbclass3
-rw-r--r--meta/conf/machine/qemux86-64.conf1
-rw-r--r--meta/recipes-core/tasks/task-cross-canadian.bb6
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc2
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian.inc2
6 files changed, 10 insertions, 6 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index f608db25d4..7971147cbe 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -68,3 +68,6 @@ export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
68 68
69# Cross-canadian packages need to pull in nativesdk dynamic libs 69# Cross-canadian packages need to pull in nativesdk dynamic libs
70SHLIBSDIR = "${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${BUILD_OS}/shlibs" 70SHLIBSDIR = "${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${BUILD_OS}/shlibs"
71
72# handle x86_64 TARGET_ARCH name
73TRANSLATED_TARGET_ARCH ?= ${TARGET_ARCH}
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 31459cd084..fd34709b78 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -3,6 +3,7 @@
3#@DESCRIPTION: Machine configuration for running a common x86 3#@DESCRIPTION: Machine configuration for running a common x86
4 4
5TARGET_ARCH = "x86_64" 5TARGET_ARCH = "x86_64"
6TRANSLATED_TARGET_ARCH = "x86-64"
6PACKAGE_EXTRA_ARCHS = "x86" 7PACKAGE_EXTRA_ARCHS = "x86"
7 8
8PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" 9PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
diff --git a/meta/recipes-core/tasks/task-cross-canadian.bb b/meta/recipes-core/tasks/task-cross-canadian.bb
index 6a7cd2e9e6..c32afdcbd2 100644
--- a/meta/recipes-core/tasks/task-cross-canadian.bb
+++ b/meta/recipes-core/tasks/task-cross-canadian.bb
@@ -8,8 +8,8 @@ inherit cross-canadian
8PACKAGES = "${PN}" 8PACKAGES = "${PN}"
9 9
10RDEPENDS_${PN} = "\ 10RDEPENDS_${PN} = "\
11 binutils-cross-canadian-${TARGET_ARCH} \ 11 binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} \
12 gdb-cross-canadian-${TARGET_ARCH} \ 12 gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} \
13 gcc-cross-canadian-${TARGET_ARCH} \ 13 gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} \
14 " 14 "
15 15
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
index 68a8e5a3a0..2fca81dbeb 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
@@ -2,7 +2,7 @@ inherit cross-canadian
2 2
3 3
4DESCRIPTION = "A GNU collection of cross-canadian binary utilities for ${TARGET_ARCH} target" 4DESCRIPTION = "A GNU collection of cross-canadian binary utilities for ${TARGET_ARCH} target"
5PN = "binutils-cross-canadian-${TARGET_ARCH}" 5PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}"
6BPN = "binutils" 6BPN = "binutils"
7 7
8DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/libc-nativesdk zlib-nativesdk gettext-nativesdk" 8DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/libc-nativesdk zlib-nativesdk gettext-nativesdk"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 0d39900cae..cc0a3badb9 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -1,7 +1,7 @@
1inherit cross-canadian 1inherit cross-canadian
2 2
3DESCRIPTION = "The cross-canadian GNU cc and gcc C compilers for ${TARGET_ARCH} target." 3DESCRIPTION = "The cross-canadian GNU cc and gcc C compilers for ${TARGET_ARCH} target."
4PN = "gcc-cross-canadian-${TARGET_ARCH}" 4PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}"
5BPN = "gcc" 5BPN = "gcc"
6 6
7DEPENDS = "virtual/${HOST_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc gettext-nativesdk" 7DEPENDS = "virtual/${HOST_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc gettext-nativesdk"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
index 8fe5ad8235..90a20e2868 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -1,7 +1,7 @@
1inherit cross-canadian 1inherit cross-canadian
2 2
3DESCRIPTION = "cross-canadian gdb for ${TARGET_ARCH} target - GNU debugger" 3DESCRIPTION = "cross-canadian gdb for ${TARGET_ARCH} target - GNU debugger"
4PN = "gdb-cross-canadian-${TARGET_ARCH}" 4PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
5BPN = "gdb" 5BPN = "gdb"
6 6
7DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk" 7DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk"