[oe-commits] org.oe.dev Integrate mainstream to build meta-toolchain-openmoko

[john_lee commit]

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

Author: john_lee at openmoko.com
Branch: org.openembedded.dev
Revision: 439ba6850918ac5bb0a912806f161615798957ab
ViewMTN: http://monotone.openembedded.org/revision/info/439ba6850918ac5bb0a912806f161615798957ab
Files:
1
packages/tasks/task-toolchain-openmoko-sdk.bb
packages/tasks/task-openmoko-toolchain-target.bb
packages/tasks/task-openmoko-toolchain-host.bb
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
packages/meta/meta-toolchain-openmoko.bb
packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
packages/openmoko2/openmoko-sample2_svn.bb
Diffs:

#
# mt diff -r6de03b1e10d4352235134bf9e8ddd26a833adb2b -r439ba6850918ac5bb0a912806f161615798957ab
#
#
#
# rename "packages/tasks/task-toolchain-openmoko-sdk.bb"
#     to "packages/tasks/task-openmoko-toolchain-target.bb"
# 
# add_file "packages/tasks/task-openmoko-toolchain-host.bb"
#  content [18d598d5b825df34b71ca3782f11a025f482fd94]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [936fa5b0bafa49c816782957d4d6d7de12cee042]
#    to [d939e4e57f7be0ec0a2a1c3e58adebad4681dd95]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [1df2888b06fa8bebf457b47741654843adbee89c]
#    to [89b5415ba759e4760f6b0f4d0fa57af041974ab0]
# 
# patch "packages/meta/meta-toolchain-openmoko.bb"
#  from [052ed3fc28dde371bd81be6bf9ffaa47c10deb57]
#    to [f000500522481be8fccfefb2de4206928ef6398c]
# 
# patch "packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb"
#  from [e3fd4a716a5bcfff74dd72a3a454d8c2ce401e7d]
#    to [d90b9e48b2570a1906b72dcb19d0a8764fe6c23b]
# 
# patch "packages/openmoko2/openmoko-sample2_svn.bb"
#  from [8dfb2ad71843cf6a80cb46f17623565dbd5a95fa]
#    to [a61d8328ee5045b2900ded896f242323d1b659bb]
# 
# patch "packages/tasks/task-openmoko-toolchain-target.bb"
#  from [4526d09a7c1a87ae65eac1a78599062dad98e280]
#    to [28005de19ec998c9abe5e7d383d158bf18bbfc14]
#
============================================================
--- packages/tasks/task-openmoko-toolchain-host.bb	18d598d5b825df34b71ca3782f11a025f482fd94
+++ packages/tasks/task-openmoko-toolchain-host.bb	18d598d5b825df34b71ca3782f11a025f482fd94
@@ -0,0 +1,13 @@
+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 \
+"
============================================================
--- conf/distro/include/moko-autorev.inc	936fa5b0bafa49c816782957d4d6d7de12cee042
+++ conf/distro/include/moko-autorev.inc	d939e4e57f7be0ec0a2a1c3e58adebad4681dd95
@@ -39,6 +39,7 @@ SRCREV_pn-openmoko-today2-folders ?= "${
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
+SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
 
 SRCREV_pn-openocd ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc	1df2888b06fa8bebf457b47741654843adbee89c
+++ conf/distro/include/sane-srcrevs.inc	89b5415ba759e4760f6b0f4d0fa57af041974ab0
@@ -112,6 +112,7 @@ SRCREV_pn-openmoko-today2-folders ?= "34
 SRCREV_pn-openmoko-today ?= "3056"
 SRCREV_pn-openmoko-today2 ?= "3609"
 SRCREV_pn-openmoko-today2-folders ?= "3414"
+SRCREV_pn-openmoko-toolchain-scripts ?= "3683"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
============================================================
--- packages/meta/meta-toolchain-openmoko.bb	052ed3fc28dde371bd81be6bf9ffaa47c10deb57
+++ packages/meta/meta-toolchain-openmoko.bb	f000500522481be8fccfefb2de4206928ef6398c
@@ -1,4 +1,6 @@
-TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk"
+PR = "r1"
 
-require meta-toolchain.bb
+TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target"
+TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host"
 
+require meta-toolchain.bb
============================================================
--- packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb	e3fd4a716a5bcfff74dd72a3a454d8c2ce401e7d
+++ packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb	d90b9e48b2570a1906b72dcb19d0a8764fe6c23b
@@ -1,15 +1,14 @@ DESCRIPTION = "Convenient scripts to be 
 DESCRIPTION = "Convenient scripts to be used with openmoko toolchain."
-PACKAGE_ARCH = "all"
+PR = "r1"
 
 SRC_URI = "svn://svn.openmoko.org/developers/john_lee;module=toolkit;proto=http"
-SRC_URI += "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/applications;module=openmoko-sample2;proto=http"
 
-SRCREV="3630"
+S = "${WORKDIR}/toolkit"
+
 FILES_${PN} = "/"
 
 do_install () {
-	(find ${WORKDIR} -type d -name ".svn" | xargs rm -rf) || true
-	install -m 755 -d ${D}/share
-	cp -dr ${WORKDIR}/toolkit/* ${D}
-	cp -dr ${WORKDIR}/openmoko-sample2 ${D}/share
+	cp -dr ${S}/* ${D}
+	find ${D} -name ".svn" | xargs rm -rf
+	rm -r ${D}/patches
 }
============================================================
--- packages/openmoko2/openmoko-sample2_svn.bb	8dfb2ad71843cf6a80cb46f17623565dbd5a95fa
+++ packages/openmoko2/openmoko-sample2_svn.bb	a61d8328ee5045b2900ded896f242323d1b659bb
@@ -9,7 +9,7 @@ FILES_${PN}-src = "/usr/local/openmoko"
 PACKAGES += "${PN}-src"
 # path should match the toolchain path
 FILES_${PN}-src = "/usr/local/openmoko"
-PACKAGE_ARCH_${PN}-src = "all"
+PACKAGE_ARCH_${PN}-src = "${BUILD_ARCH}-all-sdk"
 
 do_configure_prepend() {
 	install -d ${WORKDIR}/source
============================================================
--- packages/tasks/task-toolchain-openmoko-sdk.bb	4526d09a7c1a87ae65eac1a78599062dad98e280
+++ packages/tasks/task-openmoko-toolchain-target.bb	28005de19ec998c9abe5e7d383d158bf18bbfc14
@@ -26,6 +26,5 @@ RDEPENDS_${PN} = "\
     libmokoui2-dev \
     libmokopanelui2-dev \
     libmokojournal2-dev \
-    openmoko-sample2-src \
     openmoko-toolchain-scripts \
 "