* [PATCH 1/2] cross-canadian: pkg name includes target arch
2010-12-06 10:00 [PATCH 0/2] Bug #528 fixing Lianhao Lu
@ 2010-12-01 2:13 ` Lianhao Lu
2010-12-06 9:45 ` [PATCH 2/2] Using TRANSLATED_TARGET_ARCH instead of TARGET_ARCH Lianhao Lu
1 sibling, 0 replies; 3+ messages in thread
From: Lianhao Lu @ 2010-12-01 2:13 UTC (permalink / raw)
To: yocto, joshua.lock
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>
---
meta/recipes-core/meta/meta-toolchain.bb | 2 +-
meta/recipes-core/tasks/task-cross-canadian.bb | 15 +++++++++++++++
meta/recipes-core/tasks/task-sdk-host.bb | 5 +----
.../binutils/binutils-cross-canadian.inc | 6 ++++++
.../binutils/binutils-cross-canadian_2.20.1.bb | 2 +-
meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4 ++++
.../gcc/gcc-cross-canadian_4.3.3.bb | 2 +-
.../gcc/gcc-cross-canadian_4.5.1.bb | 2 +-
meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 7 +++++++
.../recipes-devtools/gdb/gdb-cross-canadian_7.2.bb | 7 ++-----
10 files changed, 39 insertions(+), 13 deletions(-)
create mode 100644 meta/recipes-core/tasks/task-cross-canadian.bb
create mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian.inc
diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb
index 2fab8f9..8b62fab 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"
+TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian"
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
new file mode 100644
index 0000000..6a7cd2e
--- /dev/null
+++ b/meta/recipes-core/tasks/task-cross-canadian.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Host SDK package for cross canadian toolchain"
+PR = "r0"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+inherit cross-canadian
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} = "\
+ binutils-cross-canadian-${TARGET_ARCH} \
+ gdb-cross-canadian-${TARGET_ARCH} \
+ gcc-cross-canadian-${TARGET_ARCH} \
+ "
+
diff --git a/meta/recipes-core/tasks/task-sdk-host.bb b/meta/recipes-core/tasks/task-sdk-host.bb
index bccf48d..7bf4453 100644
--- a/meta/recipes-core/tasks/task-sdk-host.bb
+++ b/meta/recipes-core/tasks/task-sdk-host.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
-PR = "r8"
+PR = "r9"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
@@ -12,9 +12,6 @@ inherit nativesdk
PACKAGES = "${PN}"
RDEPENDS_${PN} = "\
- binutils-cross-canadian \
- gdb-cross-canadian \
- gcc-cross-canadian \
pkgconfig-nativesdk \
qemu-nativesdk \
qemu-helper-nativesdk \
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
index 4953bc2..68a8e5a 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
@@ -1,4 +1,10 @@
inherit cross-canadian
+
+
+DESCRIPTION = "A GNU collection of cross-canadian binary utilities for ${TARGET_ARCH} target"
+PN = "binutils-cross-canadian-${TARGET_ARCH}"
+BPN = "binutils"
+
DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/libc-nativesdk zlib-nativesdk gettext-nativesdk"
EXTRA_OECONF = "--with-sysroot=${SDKPATH}/sysroots/${TARGET_SYS} \
--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 631be4f..1621b77 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 @@
require binutils_${PV}.bb
require binutils-cross-canadian.inc
-PR = "r5"
+PR = "r6"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index a3b15c3..0d39900 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -1,4 +1,8 @@
inherit cross-canadian
+DESCRIPTION = "The cross-canadian GNU cc and gcc C compilers for ${TARGET_ARCH} target."
+PN = "gcc-cross-canadian-${TARGET_ARCH}"
+BPN = "gcc"
+
DEPENDS = "virtual/${HOST_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc gettext-nativesdk"
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 43bab39..d420f80 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
require gcc-configure-sdk.inc
require gcc-package-sdk.inc
-PR = "r19"
+PR = "r20"
DEPENDS += "gmp-nativesdk mpfr-nativesdk"
RDEPENDS_${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 e160aab..98e239d 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
require gcc-configure-sdk.inc
require gcc-package-sdk.inc
-PR = "r0"
+PR = "r1"
DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
RDEPENDS_${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 0000000..8fe5ad8
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -0,0 +1,7 @@
+inherit cross-canadian
+
+DESCRIPTION = "cross-canadian gdb for ${TARGET_ARCH} target - GNU debugger"
+PN = "gdb-cross-canadian-${TARGET_ARCH}"
+BPN = "gdb"
+
+DEPENDS = "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 5982c05..ca44b3c 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 @@
require gdb-common.inc
+require gdb-cross-canadian.inc
-DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk"
-
-inherit cross-canadian
-
-PR = "r0"
+PR = "r1"
GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
EXPAT = "--with-expat"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] Using TRANSLATED_TARGET_ARCH instead of TARGET_ARCH.
2010-12-06 10:00 [PATCH 0/2] Bug #528 fixing Lianhao Lu
2010-12-01 2:13 ` [PATCH 1/2] cross-canadian: pkg name includes target arch Lianhao Lu
@ 2010-12-06 9:45 ` Lianhao Lu
1 sibling, 0 replies; 3+ messages in thread
From: Lianhao Lu @ 2010-12-06 9:45 UTC (permalink / raw)
To: yocto, joshua.lock
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>
---
meta/classes/cross-canadian.bbclass | 3 +++
meta/conf/machine/qemux86-64.conf | 1 +
meta/recipes-core/tasks/task-cross-canadian.bb | 6 +++---
.../binutils/binutils-cross-canadian.inc | 2 +-
meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 2 +-
meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 2 +-
6 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index f608db2..7971147 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}"
# Cross-canadian packages need to pull in nativesdk dynamic libs
SHLIBSDIR = "${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${BUILD_OS}/shlibs"
+
+# handle x86_64 TARGET_ARCH name
+TRANSLATED_TARGET_ARCH ?= ${TARGET_ARCH}
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 31459cd..fd34709 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for running a common x86
TARGET_ARCH = "x86_64"
+TRANSLATED_TARGET_ARCH = "x86-64"
PACKAGE_EXTRA_ARCHS = "x86"
PREFERRED_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 6a7cd2e..c32afdc 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
PACKAGES = "${PN}"
RDEPENDS_${PN} = "\
- binutils-cross-canadian-${TARGET_ARCH} \
- gdb-cross-canadian-${TARGET_ARCH} \
- gcc-cross-canadian-${TARGET_ARCH} \
+ binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} \
+ gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} \
+ gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} \
"
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
index 68a8e5a..2fca81d 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
DESCRIPTION = "A GNU collection of cross-canadian binary utilities for ${TARGET_ARCH} target"
-PN = "binutils-cross-canadian-${TARGET_ARCH}"
+PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}"
BPN = "binutils"
DEPENDS = "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 0d39900..cc0a3ba 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -1,7 +1,7 @@
inherit cross-canadian
DESCRIPTION = "The cross-canadian GNU cc and gcc C compilers for ${TARGET_ARCH} target."
-PN = "gcc-cross-canadian-${TARGET_ARCH}"
+PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}"
BPN = "gcc"
DEPENDS = "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 8fe5ad8..90a20e2 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -1,7 +1,7 @@
inherit cross-canadian
DESCRIPTION = "cross-canadian gdb for ${TARGET_ARCH} target - GNU debugger"
-PN = "gdb-cross-canadian-${TARGET_ARCH}"
+PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
BPN = "gdb"
DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 0/2] Bug #528 fixing.
@ 2010-12-06 10:00 Lianhao Lu
2010-12-01 2:13 ` [PATCH 1/2] cross-canadian: pkg name includes target arch Lianhao Lu
2010-12-06 9:45 ` [PATCH 2/2] Using TRANSLATED_TARGET_ARCH instead of TARGET_ARCH Lianhao Lu
0 siblings, 2 replies; 3+ messages in thread
From: Lianhao Lu @ 2010-12-06 10:00 UTC (permalink / raw)
To: yocto, joshua.lock
Merged with the previous commit 1185fb9 to fixing bug #528.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: llu/fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/fix
Thanks,
Lianhao Lu <lianhao.lu@intel.com>
---
Lianhao Lu (2):
cross-canadian: pkg name includes target arch
Using TRANSLATED_TARGET_ARCH instead of TARGET_ARCH.
meta/classes/cross-canadian.bbclass | 3 +++
meta/conf/machine/qemux86-64.conf | 1 +
meta/recipes-core/meta/meta-toolchain.bb | 2 +-
meta/recipes-core/tasks/task-cross-canadian.bb | 15 +++++++++++++++
meta/recipes-core/tasks/task-sdk-host.bb | 5 +----
.../binutils/binutils-cross-canadian.inc | 6 ++++++
.../binutils/binutils-cross-canadian_2.20.1.bb | 2 +-
meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4 ++++
.../gcc/gcc-cross-canadian_4.3.3.bb | 2 +-
.../gcc/gcc-cross-canadian_4.5.1.bb | 2 +-
meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 7 +++++++
.../recipes-devtools/gdb/gdb-cross-canadian_7.2.bb | 7 ++-----
12 files changed, 43 insertions(+), 13 deletions(-)
create mode 100644 meta/recipes-core/tasks/task-cross-canadian.bb
create mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian.inc
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-12-06 10:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-06 10:00 [PATCH 0/2] Bug #528 fixing Lianhao Lu
2010-12-01 2:13 ` [PATCH 1/2] cross-canadian: pkg name includes target arch Lianhao Lu
2010-12-06 9:45 ` [PATCH 2/2] Using TRANSLATED_TARGET_ARCH instead of TARGET_ARCH Lianhao Lu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.