diff options
-rw-r--r-- | meta/classes/sdk.bbclass | 6 | ||||
-rw-r--r-- | meta/packages/meta/meta-toolchain.bb | 13 | ||||
-rw-r--r-- | meta/packages/tasks/task-sdk.bb | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass index 9024f3fda7..545cfd20c7 100644 --- a/meta/classes/sdk.bbclass +++ b/meta/classes/sdk.bbclass | |||
@@ -2,8 +2,10 @@ | |||
2 | # or indirectly via dependency. No need to be in 'world'. | 2 | # or indirectly via dependency. No need to be in 'world'. |
3 | EXCLUDE_FROM_WORLD = "1" | 3 | EXCLUDE_FROM_WORLD = "1" |
4 | 4 | ||
5 | SDK_NAME = "poky/${TARGET_ARCH}" | 5 | SDK_NAME = "${DISTRO}/${TARGET_ARCH}" |
6 | PACKAGE_ARCH = "${BUILD_ARCH}" | 6 | |
7 | OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} | ||
8 | PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk" | ||
7 | 9 | ||
8 | HOST_ARCH = "${BUILD_ARCH}" | 10 | HOST_ARCH = "${BUILD_ARCH}" |
9 | HOST_VENDOR = "${BUILD_VENDOR}" | 11 | HOST_VENDOR = "${BUILD_VENDOR}" |
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb index 72513dff6a..91d8f16cb8 100644 --- a/meta/packages/meta/meta-toolchain.bb +++ b/meta/packages/meta/meta-toolchain.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | DESCRIPTION = "Meta package for building a installable toolchain" | 1 | DESCRIPTION = "Meta package for building a installable toolchain" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" | 3 | DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" |
4 | PR = "r1" | 4 | PR = "r2" |
5 | 5 | ||
6 | inherit sdk | 6 | inherit sdk |
7 | 7 | ||
@@ -20,7 +20,14 @@ IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix} | |||
20 | HOST_INSTALL = "\ | 20 | HOST_INSTALL = "\ |
21 | binutils-cross-sdk \ | 21 | binutils-cross-sdk \ |
22 | gcc-cross-sdk \ | 22 | gcc-cross-sdk \ |
23 | gdb-cross" | 23 | g++ \ |
24 | cpp \ | ||
25 | libgcc \ | ||
26 | libstdc++ \ | ||
27 | libstdc++-dev \ | ||
28 | gdb-cross \ | ||
29 | " | ||
30 | |||
24 | TARGET_INSTALL = "\ | 31 | TARGET_INSTALL = "\ |
25 | task-sdk-bare \ | 32 | task-sdk-bare \ |
26 | " | 33 | " |
@@ -36,7 +43,6 @@ do_populate_sdk() { | |||
36 | 43 | ||
37 | cat <<EOF >${SDK_DIR}/ipkg-host.conf | 44 | cat <<EOF >${SDK_DIR}/ipkg-host.conf |
38 | src oe file:${DEPLOY_DIR_IPK} | 45 | src oe file:${DEPLOY_DIR_IPK} |
39 | arch ${BUILD_ARCH} 1 | ||
40 | EOF | 46 | EOF |
41 | cat <<EOF >${SDK_DIR}/ipkg-target.conf | 47 | cat <<EOF >${SDK_DIR}/ipkg-target.conf |
42 | src oe file:${DEPLOY_DIR_IPK} | 48 | src oe file:${DEPLOY_DIR_IPK} |
@@ -45,6 +51,7 @@ EOF | |||
45 | priority=1 | 51 | priority=1 |
46 | for arch in $ipkgarchs; do | 52 | for arch in $ipkgarchs; do |
47 | echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf | 53 | echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf |
54 | echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${SDK_DIR}/ipkg-host.conf | ||
48 | priority=$(expr $priority + 5) | 55 | priority=$(expr $priority + 5) |
49 | done | 56 | done |
50 | 57 | ||
diff --git a/meta/packages/tasks/task-sdk.bb b/meta/packages/tasks/task-sdk.bb index 2b3ef9cf2f..5ce8772a1f 100644 --- a/meta/packages/tasks/task-sdk.bb +++ b/meta/packages/tasks/task-sdk.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | DESCRIPTION = "SDK packages" | 1 | DESCRIPTION = "SDK packages" |
2 | PR = "r9" | 2 | PR = "r12" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | ALLOW_EMPTY = "1" | 4 | ALLOW_EMPTY = "1" |
5 | 5 | ||