[oe-commits] org.oe.dev (Merge OM mtn modification back into mainline)

[john_lee commit]

(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

Author: john_lee at openmoko.com
Branch: org.openembedded.dev
Revision: 4b30415f5d28ab66598f7324bc7a1a3f91781ed2
ViewMTN: http://monotone.openembedded.org/revision/info/4b30415f5d28ab66598f7324bc7a1a3f91781ed2
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 -r7b5a121460a4867fa930ed58cc8df78a6b2ba234 -r4b30415f5d28ab66598f7324bc7a1a3f91781ed2
#
# 
# 
# 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 [b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [2f7cb2290c8041be1845553e70a09af8c92e718d]
#    to [1243c122ad661be1683a045938d93537f205ce15]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [0f5e441b0fc2a2781297da7b38cb843e8c77f550]
#    to [d560814623625b6b57fc9aad038a6e4e6b62f271]
# 
# patch "packages/meta/meta-toolchain-openmoko.bb"
#  from [2c36f31834b317cfdc81cff2dc8cd7db05229bcf]
#    to [76d692ed056a9397df52f5d27a16c97f29b032cd]
# 
# patch "packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb"
#  from [e3fd4a716a5bcfff74dd72a3a454d8c2ce401e7d]
#    to [d90b9e48b2570a1906b72dcb19d0a8764fe6c23b]
# 
# patch "packages/openmoko2/openmoko-sample2_svn.bb"
#  from [f81b348bfe4ffd0c3a27b9c3042e6e2945ea3971]
#    to [90b2cf8a49d86bb43022f62052a46f47d57edcee]
# 
# patch "packages/tasks/task-openmoko-toolchain-target.bb"
#  from [4526d09a7c1a87ae65eac1a78599062dad98e280]
#    to [28005de19ec998c9abe5e7d383d158bf18bbfc14]
# 
============================================================
--- packages/tasks/task-openmoko-toolchain-host.bb	b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c
+++ packages/tasks/task-openmoko-toolchain-host.bb	b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c
@@ -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 \
+"
============================================================
--- conf/distro/include/moko-autorev.inc	2f7cb2290c8041be1845553e70a09af8c92e718d
+++ conf/distro/include/moko-autorev.inc	1243c122ad661be1683a045938d93537f205ce15
@@ -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	0f5e441b0fc2a2781297da7b38cb843e8c77f550
+++ conf/distro/include/sane-srcrevs.inc	d560814623625b6b57fc9aad038a6e4e6b62f271
@@ -113,6 +113,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 ?= "3767"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
============================================================
--- packages/meta/meta-toolchain-openmoko.bb	2c36f31834b317cfdc81cff2dc8cd7db05229bcf
+++ packages/meta/meta-toolchain-openmoko.bb	76d692ed056a9397df52f5d27a16c97f29b032cd
@@ -1,5 +1,7 @@
-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
 SDK_SUFFIX = "toolchain-openmoko"
============================================================
--- 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	f81b348bfe4ffd0c3a27b9c3042e6e2945ea3971
+++ packages/openmoko2/openmoko-sample2_svn.bb	90b2cf8a49d86bb43022f62052a46f47d57edcee
@@ -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 \
 "