sdk.bbclass: Set PACKAGE_ARCH to something suitable (update task-sdk, meta-toolchain)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1956 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass
index 9024f3fda73f44540864d75fea71b04fb4c5e047..545cfd20c7ab6322833644b83d90bcf18e7cdb9e 100644 (file)
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/sdk.bbclass
@@ -2,8 +2,10 @@
 # or indirectly via dependency.  No need to be in 'world'.
 EXCLUDE_FROM_WORLD = "1"
 
-SDK_NAME = "poky/${TARGET_ARCH}"
-PACKAGE_ARCH = "${BUILD_ARCH}"
+SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
+
+OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
+PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
 
 HOST_ARCH = "${BUILD_ARCH}"
 HOST_VENDOR = "${BUILD_VENDOR}"

diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 72513dff6aa9806f835da74f3bde646afaeb4813..91d8f16cb8076a10fb6af0a4fd0fb83dd071a2c0 100644 (file)
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
-PR = "r1"
+PR = "r2"
 
 inherit sdk
 
@@ -20,7 +20,14 @@ IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}
 HOST_INSTALL = "\
     binutils-cross-sdk \
     gcc-cross-sdk \
-    gdb-cross"
+    g++ \
+    cpp \
+    libgcc \
+    libstdc++ \
+    libstdc++-dev \
+    gdb-cross \
+    "
+
 TARGET_INSTALL = "\
     task-sdk-bare \
     "
@@ -36,7 +43,6 @@ do_populate_sdk() {
 
        cat <<EOF >${SDK_DIR}/ipkg-host.conf
 src oe file:${DEPLOY_DIR_IPK}
-arch ${BUILD_ARCH} 1
 EOF
         cat <<EOF >${SDK_DIR}/ipkg-target.conf
 src oe file:${DEPLOY_DIR_IPK}
@@ -45,6 +51,7 @@ EOF
         priority=1
         for arch in $ipkgarchs; do
                 echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf
+               echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${SDK_DIR}/ipkg-host.conf
                priority=$(expr $priority + 5)
         done
 

diff --git a/meta/packages/tasks/task-sdk.bb b/meta/packages/tasks/task-sdk.bb
index 2b3ef9cf2f8733c0c61eb87aed750ba62c1ecf90..5ce8772a1fe11d3ca59445166e260d2d44e12ed1 100644 (file)
--- a/meta/packages/tasks/task-sdk.bb
+++ b/meta/packages/tasks/task-sdk.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK packages"
-PR = "r9"
+PR = "r12"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"