[oe-commits] org.oe.dev meta-toolchain: Switch to use task-sdk-host and allow TOOLCHAIN tasks to be overridden by the distro

[rpurdie commit]

meta-toolchain: Switch to use task-sdk-host and allow TOOLCHAIN tasks to be overridden by the distro

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 669fa4ac16dc898e9626875a5b530e1c4116a905
ViewMTN: http://monotone.openembedded.org/revision.psp?id=669fa4ac16dc898e9626875a5b530e1c4116a905
Files:
1
packages/tasks/task-sdk-host.bb
packages/meta/meta-toolchain.bb
Diffs:

#
# mt diff -r3154e6284aec20201f888221e1c645d41025eb41 -r669fa4ac16dc898e9626875a5b530e1c4116a905
#
# 
# 
# add_file "packages/tasks/task-sdk-host.bb"
#  content [d8cf93c8023c6249cd6499a8ca3ffe51abcac72f]
# 
# patch "packages/meta/meta-toolchain.bb"
#  from [6145083b55ef461e2108c0082d00f7ebc6248e87]
#    to [f3869892e4ec081f70f4d0a1f766a5286aa9731b]
# 
============================================================
--- packages/tasks/task-sdk-host.bb	d8cf93c8023c6249cd6499a8ca3ffe51abcac72f
+++ packages/tasks/task-sdk-host.bb	d8cf93c8023c6249cd6499a8ca3ffe51abcac72f
@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd
+#
+
+DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
+PR = "r1"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+inherit sdk
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} = "\
+    binutils-cross-sdk \
+    gcc-cross-sdk \
+    gdb-cross-sdk \
+    g++ \
+    cpp \
+    libgcc \
+    libgcc-dev \
+    libstdc++ \
+    libstdc++-dev \
+    "
============================================================
--- packages/meta/meta-toolchain.bb	6145083b55ef461e2108c0082d00f7ebc6248e87
+++ packages/meta/meta-toolchain.bb	f3869892e4ec081f70f4d0a1f766a5286aa9731b
@@ -11,15 +11,10 @@ IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TAR
 IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
 IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${prefix}"
 
-HOST_INSTALL = "\
-    binutils-cross-sdk \
-    gcc-cross-sdk \
-    gdb-cross"
-TARGET_INSTALL = "\
-    task-sdk-bare \
-    "
+TOOLCHAIN_HOST_TASK ?= "task-sdk-host"
+TOOLCHAIN_TARGET_TASK ?= "task-sdk-bare"
 
-RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
+RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
 
 do_populate_sdk() {
 	rm -rf ${SDK_OUTPUT}
@@ -33,10 +28,10 @@ do_populate_sdk() {
 	done
 
 	${IPKG_HOST} update
-	${IPKG_HOST} -force-depends install ${HOST_INSTALL}
+	${IPKG_HOST} -force-depends install ${TOOLCHAIN_HOST_TASK}
 
 	${IPKG_TARGET} update
-	${IPKG_TARGET} install ${TARGET_INSTALL}
+	${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK}
 
 	mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
 	cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}