From f19cf866982d04bbde0a007fca07ed5db66e3898 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Sat, 1 Sep 2007 22:49:32 +0000
Subject: meta-toolchain: Change to be more generic and use package_ipk conf
 generation functions. Also rename task-poky-standalone-sdk-host to
 task-sdk-host and add copyright.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2638 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/meta/meta-toolchain.bb               | 18 ++++++----------
 .../tasks/task-poky-standalone-sdk-host.bb         | 20 ------------------
 meta/packages/tasks/task-sdk-host.bb               | 24 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 32 deletions(-)
 delete mode 100644 meta/packages/tasks/task-poky-standalone-sdk-host.bb
 create mode 100644 meta/packages/tasks/task-sdk-host.bb

(limited to 'meta')

diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index a0f38404b..36c1479b6 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -11,33 +11,27 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
 IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
 IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${prefix}"
 
-HOST_INSTALL = "task-poky-standalone-sdk-host"
+TOOLCHAIN_HOST_TASK ?= "task-sdk-host"
+TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target"
 
-TARGET_INSTALL = "task-poky-standalone-sdk-target"
-
-RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
+RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
 
 do_populate_sdk() {
-	touch ${DEPLOY_DIR_IPK}/Packages
-	ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
-
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
 
+	package_update_index_ipk
 	package_generate_ipkg_conf
 
 	for arch in ${PACKAGE_ARCHS}; do
 		revipkgarchs="$arch $revipkgarchs"
 	done
 
-	rm -r ${SDK_OUTPUT}
-	mkdir -p ${SDK_OUTPUT}
-
 	${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}
diff --git a/meta/packages/tasks/task-poky-standalone-sdk-host.bb b/meta/packages/tasks/task-poky-standalone-sdk-host.bb
deleted file mode 100644
index a8beb054a..000000000
--- a/meta/packages/tasks/task-poky-standalone-sdk-host.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Host packages for the standalone SDK (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 \
-    "
diff --git a/meta/packages/tasks/task-sdk-host.bb b/meta/packages/tasks/task-sdk-host.bb
new file mode 100644
index 000000000..d238b4614
--- /dev/null
+++ b/meta/packages/tasks/task-sdk-host.bb
@@ -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 \
+    "
-- 
cgit v1.2.3