From 357ee099c60ddf4fe162b8e24aeeba52edf4099a Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 17 Jan 2008 09:03:38 +0000
Subject: (Merge OM mtn modification back into mainline) Integrate mainstream
 to build meta-toolchain-openmoko packages/meta/meta-toolchain-openmoko.bb:
 will install task-openmoko-toolchain-{target,host}
 task-openmoko-toolchain-target: specific to target arch.
 task-openmoko-toolchain-host: for host and all, such as openmoko-sample2-src
 moko-autorev.inc, sane-srcrevs.inc: add SRCREV_pn-openmoko-toolchain-scripts
 openmoko-toolchain-scripts_svn.bb: will not install sample code now.
 openmoko-sample2_svn.bb: update PACKAGE_ARCH_${PN}-src to be used by
 ipkg-sdk.conf

---
 packages/tasks/task-openmoko-toolchain-host.bb   | 26 ++++++++++++++++++++
 packages/tasks/task-openmoko-toolchain-target.bb | 30 +++++++++++++++++++++++
 packages/tasks/task-toolchain-openmoko-sdk.bb    | 31 ------------------------
 3 files changed, 56 insertions(+), 31 deletions(-)
 create mode 100644 packages/tasks/task-openmoko-toolchain-host.bb
 create mode 100644 packages/tasks/task-openmoko-toolchain-target.bb
 delete mode 100644 packages/tasks/task-toolchain-openmoko-sdk.bb

(limited to 'packages/tasks')

diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb
new file mode 100644
index 0000000000..31ac3bb746
--- /dev/null
+++ b/packages/tasks/task-openmoko-toolchain-host.bb
@@ -0,0 +1,26 @@
+require task-sdk-host.bb
+
+DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PR = "r0"
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} += "\
+    openmoko-sample2-src \
+"
+require task-sdk-host.bb
+
+DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PR = "r0"
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} += "\
+    openmoko-sample2-src \
+"
diff --git a/packages/tasks/task-openmoko-toolchain-target.bb b/packages/tasks/task-openmoko-toolchain-target.bb
new file mode 100644
index 0000000000..281884d051
--- /dev/null
+++ b/packages/tasks/task-openmoko-toolchain-target.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PR = "r2"
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} = "\
+    glibc \
+    glibc-dbg \
+    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++ \
+    \
+    libmokogsmd2-dev \
+    libmokoui2-dev \
+    libmokopanelui2-dev \
+    libmokojournal2-dev \
+    openmoko-toolchain-scripts \
+"
diff --git a/packages/tasks/task-toolchain-openmoko-sdk.bb b/packages/tasks/task-toolchain-openmoko-sdk.bb
deleted file mode 100644
index bcb2d370a6..0000000000
--- a/packages/tasks/task-toolchain-openmoko-sdk.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
-LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-
-PR = "r2"
-
-PACKAGES = "${PN}"
-
-RDEPENDS_${PN} = "\
-    glibc \
-    glibc-dbg \
-    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++ \
-    \
-    libmokogsmd2-dev \
-    libmokoui2-dev \
-    libmokopanelui2-dev \
-    libmokojournal2-dev \
-    openmoko-sample2-src \
-    openmoko-toolchain-scripts \
-"
-- 
cgit v1.2.3