From d7ff06986bac3ee9cc14d198d199f69936dc1e4c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 28 Jun 2007 11:09:21 +0000
Subject: meta-toolchain: Create task-poky-standalone-sdk-host and target tasks
 packages and use these in meta-toolchain to avoid package renaming problems.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2038 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/meta/meta-toolchain.bb               | 20 ++++------------
 .../tasks/task-poky-standalone-sdk-host.bb         | 20 ++++++++++++++++
 .../tasks/task-poky-standalone-sdk-target.bb       | 22 +++++++++++++++++
 meta/packages/tasks/task-sdk.bb                    | 28 ----------------------
 4 files changed, 46 insertions(+), 44 deletions(-)
 create mode 100644 meta/packages/tasks/task-poky-standalone-sdk-host.bb
 create mode 100644 meta/packages/tasks/task-poky-standalone-sdk-target.bb
 delete mode 100644 meta/packages/tasks/task-sdk.bb

(limited to 'meta/packages')

diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 391adc411..652eb2537 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -17,21 +17,9 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
 IPKG_HOST = "ipkg-cl -f ${SDK_DIR}/ipkg-host.conf -o ${SDK_OUTPUT}"
 IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
 
-HOST_INSTALL = "\
-    binutils-cross-sdk \
-    gcc-cross-sdk \
-    g++ \
-    cpp \
-    libgcc \
-    libgcc-dev \
-    libstdc++ \
-    libstdc++-dev \
-    gdb-cross \
-    "
-
-TARGET_INSTALL = "\
-    task-sdk-bare \
-    "
+HOST_INSTALL = "task-poky-standalone-sdk-host"
+
+TARGET_INSTALL = "task-poky-standalone-sdk-target"
 
 RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
 
@@ -60,7 +48,7 @@ EOF
 	mkdir -p ${SDK_OUTPUT}
 
 	${IPKG_HOST} update
-	${IPKG_HOST} -nodeps install ${HOST_INSTALL}
+	${IPKG_HOST} -force-depends install ${HOST_INSTALL}
 
 	${IPKG_TARGET} update
 	${IPKG_TARGET} install ${TARGET_INSTALL}
diff --git a/meta/packages/tasks/task-poky-standalone-sdk-host.bb b/meta/packages/tasks/task-poky-standalone-sdk-host.bb
new file mode 100644
index 000000000..2140e9662
--- /dev/null
+++ b/meta/packages/tasks/task-poky-standalone-sdk-host.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Host packages for the standalone SDK (external toolchain)"
+PR = "r0"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+inherit sdk
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} = "\
+    binutils-cross-sdk \
+    gcc-cross-sdk \
+    g++ \
+    cpp \
+    libgcc \
+    libgcc-dev \
+    libstdc++ \
+    libstdc++-dev \
+    gdb-cross \
+    "
\ No newline at end of file
diff --git a/meta/packages/tasks/task-poky-standalone-sdk-target.bb b/meta/packages/tasks/task-poky-standalone-sdk-target.bb
new file mode 100644
index 000000000..6945715c4
--- /dev/null
+++ b/meta/packages/tasks/task-poky-standalone-sdk-target.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Target packages for the standalone SDK (external toolchain)"
+PR = "r0"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} = "\
+    glibc \
+    glibc-dev \
+    glibc-utils \
+    libsegfault \
+    glibc-thread-db \
+    glibc-localedata-i18n \
+    glibc-gconv-ibm850 \
+    glibc-gconv-cp1252 \
+    glibc-gconv-iso8859-1 \
+    glibc-gconv-iso8859-15 \
+    locale-base-en-gb \
+    libgcc \
+    libstdc++ \
+    "
diff --git a/meta/packages/tasks/task-sdk.bb b/meta/packages/tasks/task-sdk.bb
deleted file mode 100644
index 1f3c4a741..000000000
--- a/meta/packages/tasks/task-sdk.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "SDK packages"
-PR = "r16"
-LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-
-PACKAGES = "\
-    task-sdk-bare \
-    "
-
-RDEPENDS_task-sdk-bare = "\
-    glibc \
-    glibc-dev \
-    glibc-utils \
-    libsegfault \
-    glibc-thread-db \
-    glibc-localedata-i18n \
-    glibc-gconv-ibm850 \
-    glibc-gconv-cp1252 \
-    glibc-gconv-iso8859-1 \
-    glibc-gconv-iso8859-15 \
-    locale-base-en-gb \
-    libgcc \
-    libstdc++ \
-    "
-
-RRECOMMENDS_task-sdk-bare = "\
-    glibc-binary-localedata-en-gb \
-    "
\ No newline at end of file
-- 
cgit v1.2.3