summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/meta/meta-toolchain.bb18
-rw-r--r--meta/packages/tasks/task-sdk-host.bb (renamed from meta/packages/tasks/task-poky-standalone-sdk-host.bb)6
2 files changed, 11 insertions, 13 deletions
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index a0f38404b0..36c1479b68 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -11,33 +11,27 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
11IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}" 11IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
12IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${prefix}" 12IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${prefix}"
13 13
14HOST_INSTALL = "task-poky-standalone-sdk-host" 14TOOLCHAIN_HOST_TASK ?= "task-sdk-host"
15TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target"
15 16
16TARGET_INSTALL = "task-poky-standalone-sdk-target" 17RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
17
18RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
19 18
20do_populate_sdk() { 19do_populate_sdk() {
21 touch ${DEPLOY_DIR_IPK}/Packages
22 ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
23
24 rm -rf ${SDK_OUTPUT} 20 rm -rf ${SDK_OUTPUT}
25 mkdir -p ${SDK_OUTPUT} 21 mkdir -p ${SDK_OUTPUT}
26 22
23 package_update_index_ipk
27 package_generate_ipkg_conf 24 package_generate_ipkg_conf
28 25
29 for arch in ${PACKAGE_ARCHS}; do 26 for arch in ${PACKAGE_ARCHS}; do
30 revipkgarchs="$arch $revipkgarchs" 27 revipkgarchs="$arch $revipkgarchs"
31 done 28 done
32 29
33 rm -r ${SDK_OUTPUT}
34 mkdir -p ${SDK_OUTPUT}
35
36 ${IPKG_HOST} update 30 ${IPKG_HOST} update
37 ${IPKG_HOST} -force-depends install ${HOST_INSTALL} 31 ${IPKG_HOST} -force-depends install ${TOOLCHAIN_HOST_TASK}
38 32
39 ${IPKG_TARGET} update 33 ${IPKG_TARGET} update
40 ${IPKG_TARGET} install ${TARGET_INSTALL} 34 ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK}
41 35
42 mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} 36 mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
43 cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} 37 cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
diff --git a/meta/packages/tasks/task-poky-standalone-sdk-host.bb b/meta/packages/tasks/task-sdk-host.bb
index a8beb054ad..d238b46144 100644
--- a/meta/packages/tasks/task-poky-standalone-sdk-host.bb
+++ b/meta/packages/tasks/task-sdk-host.bb
@@ -1,4 +1,8 @@
1DESCRIPTION = "Host packages for the standalone SDK (external toolchain)" 1#
2# Copyright (C) 2007 OpenedHand Ltd
3#
4
5DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
2PR = "r1" 6PR = "r1"
3LICENSE = "MIT" 7LICENSE = "MIT"
4ALLOW_EMPTY = "1" 8ALLOW_EMPTY = "1"