summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2010-12-01 10:13:01 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-10 15:36:30 +0000
commit322d6ab29902a51bd46303a4aed9f2b0b63cdb44 (patch)
treebbaafa1a244783689f0c2047709f3a5ecafbebf4
parentc47cfc56c779304a575507793618dccad178432f (diff)
downloadpoky-322d6ab29902a51bd46303a4aed9f2b0b63cdb44.tar.gz
cross-canadian: pkg name includes target arch
This commit fixes Bug #528. 1. Added the target arch name to the pkg name of gcc-cross-canadian, gdb-cross-candian and bintuils-cross-candian. 2. Move the cross-canadian pkgs out of task-sdk-host into a new task task-cross-canadian. 3. Added the RDEPENDS of task-cross-canadian into meta-toolchain. Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
-rw-r--r--meta/recipes-core/meta/meta-toolchain.bb2
-rw-r--r--meta/recipes-core/tasks/task-cross-canadian.bb15
-rw-r--r--meta/recipes-core/tasks/task-sdk-host.bb5
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian.inc6
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian_4.3.3.bb2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb2
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian.inc7
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb7
10 files changed, 39 insertions, 13 deletions
diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb
index 2fab8f94b2..8b62fab6bd 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}"
13IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}" 13IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
14IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${SDKTARGETSYSROOT}" 14IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
15 15
16TOOLCHAIN_HOST_TASK ?= "task-sdk-host" 16TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian"
17TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target task-poky-standalone-sdk-target-dbg" 17TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target task-poky-standalone-sdk-target-dbg"
18TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}" 18TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
19 19
diff --git a/meta/recipes-core/tasks/task-cross-canadian.bb b/meta/recipes-core/tasks/task-cross-canadian.bb
new file mode 100644
index 0000000000..6a7cd2e9e6
--- /dev/null
+++ b/meta/recipes-core/tasks/task-cross-canadian.bb
@@ -0,0 +1,15 @@
1DESCRIPTION = "Host SDK package for cross canadian toolchain"
2PR = "r0"
3LICENSE = "MIT"
4ALLOW_EMPTY = "1"
5
6inherit cross-canadian
7
8PACKAGES = "${PN}"
9
10RDEPENDS_${PN} = "\
11 binutils-cross-canadian-${TARGET_ARCH} \
12 gdb-cross-canadian-${TARGET_ARCH} \
13 gcc-cross-canadian-${TARGET_ARCH} \
14 "
15
diff --git a/meta/recipes-core/tasks/task-sdk-host.bb b/meta/recipes-core/tasks/task-sdk-host.bb
index bccf48dbde..7bf445386a 100644
--- a/meta/recipes-core/tasks/task-sdk-host.bb
+++ b/meta/recipes-core/tasks/task-sdk-host.bb
@@ -3,7 +3,7 @@
3# 3#
4 4
5DESCRIPTION = "Host packages for the standalone SDK or external toolchain" 5DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
6PR = "r8" 6PR = "r9"
7LICENSE = "MIT" 7LICENSE = "MIT"
8ALLOW_EMPTY = "1" 8ALLOW_EMPTY = "1"
9 9
@@ -12,9 +12,6 @@ inherit nativesdk
12PACKAGES = "${PN}" 12PACKAGES = "${PN}"
13 13
14RDEPENDS_${PN} = "\ 14RDEPENDS_${PN} = "\
15 binutils-cross-canadian \
16 gdb-cross-canadian \
17 gcc-cross-canadian \
18 pkgconfig-nativesdk \ 15 pkgconfig-nativesdk \
19 qemu-nativesdk \ 16 qemu-nativesdk \
20 qemu-helper-nativesdk \ 17 qemu-helper-nativesdk \
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
index 4953bc2c3b..68a8e5a3a0 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
@@ -1,4 +1,10 @@
1inherit cross-canadian 1inherit cross-canadian
2
3
4DESCRIPTION = "A GNU collection of cross-canadian binary utilities for ${TARGET_ARCH} target"
5PN = "binutils-cross-canadian-${TARGET_ARCH}"
6BPN = "binutils"
7
2DEPENDS = "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"
3EXTRA_OECONF = "--with-sysroot=${SDKPATH}/sysroots/${TARGET_SYS} \ 9EXTRA_OECONF = "--with-sysroot=${SDKPATH}/sysroots/${TARGET_SYS} \
4 --program-prefix=${TARGET_PREFIX}" 10 --program-prefix=${TARGET_PREFIX}"
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb
index 631be4fe7f..1621b77e9d 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb
@@ -1,3 +1,3 @@
1require binutils_${PV}.bb 1require binutils_${PV}.bb
2require binutils-cross-canadian.inc 2require binutils-cross-canadian.inc
3PR = "r5" 3PR = "r6"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index a3b15c3dc6..0d39900cae 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -1,4 +1,8 @@
1inherit cross-canadian 1inherit cross-canadian
2 2
3DESCRIPTION = "The cross-canadian GNU cc and gcc C compilers for ${TARGET_ARCH} target."
4PN = "gcc-cross-canadian-${TARGET_ARCH}"
5BPN = "gcc"
6
3DEPENDS = "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"
4 8
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.3.3.bb
index 43bab3961d..d420f80f26 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.3.3.bb
@@ -5,7 +5,7 @@ require gcc-cross-canadian.inc
5require gcc-configure-sdk.inc 5require gcc-configure-sdk.inc
6require gcc-package-sdk.inc 6require gcc-package-sdk.inc
7 7
8PR = "r19" 8PR = "r20"
9 9
10DEPENDS += "gmp-nativesdk mpfr-nativesdk" 10DEPENDS += "gmp-nativesdk mpfr-nativesdk"
11RDEPENDS_${PN} += "mpfr-nativesdk" 11RDEPENDS_${PN} += "mpfr-nativesdk"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb
index e160aab8a2..98e239d92c 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb
@@ -5,7 +5,7 @@ require gcc-cross-canadian.inc
5require gcc-configure-sdk.inc 5require gcc-configure-sdk.inc
6require gcc-package-sdk.inc 6require gcc-package-sdk.inc
7 7
8PR = "r0" 8PR = "r1"
9 9
10DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" 10DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
11RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" 11RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
new file mode 100644
index 0000000000..8fe5ad8235
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -0,0 +1,7 @@
1inherit cross-canadian
2
3DESCRIPTION = "cross-canadian gdb for ${TARGET_ARCH} target - GNU debugger"
4PN = "gdb-cross-canadian-${TARGET_ARCH}"
5BPN = "gdb"
6
7DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb
index 5982c0568e..ca44b3c4f0 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb
@@ -1,10 +1,7 @@
1require gdb-common.inc 1require gdb-common.inc
2require gdb-cross-canadian.inc
2 3
3DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk" 4PR = "r1"
4
5inherit cross-canadian
6
7PR = "r0"
8 5
9GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" 6GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
10EXPAT = "--with-expat" 7EXPAT = "--with-expat"