org.openmoko.dev: fd570626c1163ee4e85aa89f3de2cbeffff9f053

oe at monotone.openmoko.org oe at monotone.openmoko.org
Thu May 15 06:41:11 CEST 2008


revision:            fd570626c1163ee4e85aa89f3de2cbeffff9f053
date:                2008-05-15T04:28:03
author:              john_lee at openembedded.org
branch:              org.openmoko.dev
changelog:
merge of '5a5e955c4e067a5ab216f6e9a28c27f869862051'
     and '89bf2246d9717a428b59f1673f19dce0248cdd0f'

manifest:
format_version "1"

new_manifest [5f176bbbee311be948652e206961e2e53c0fa43e]

old_revision [5a5e955c4e067a5ab216f6e9a28c27f869862051]

add_file "classes/om-utils.bbclass"
 content [a2d8a98660fedee362fc8da5628f26077268540a]

patch "packages/tasks/task-openmoko-feed.bb"
 from [7ef80d3236128df7070e50415a62f1b4e280d8d3]
   to [5a4dbcc2848fca9059de74a31567f314ec530fdb]

old_revision [89bf2246d9717a428b59f1673f19dce0248cdd0f]

delete "packages/openmoko-spaces"

rename "packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb"
    to "packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb"

patch "packages/meta/meta-toolchain-openmoko.bb"
 from [76d692ed056a9397df52f5d27a16c97f29b032cd]
   to [f863c373260a0e447f82489950183fed3cacbca5]

patch "packages/meta/meta-toolchain.bb"
 from [653be1fcb3f433216d391a1e48cde9fd4e56e7a3]
   to [154f3d231b84fcfc3bb4298097864f5f205225df]

patch "packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb"
 from [6e078fe827ecc66c076b33267168d49dfb3657ea]
   to [602d1e114432c290bee5ea5c879d890625819c12]
-------------- next part --------------
#
#
# add_file "classes/om-utils.bbclass"
#  content [a2d8a98660fedee362fc8da5628f26077268540a]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [7ef80d3236128df7070e50415a62f1b4e280d8d3]
#    to [5a4dbcc2848fca9059de74a31567f314ec530fdb]
#
============================================================
--- classes/om-utils.bbclass	a2d8a98660fedee362fc8da5628f26077268540a
+++ classes/om-utils.bbclass	a2d8a98660fedee362fc8da5628f26077268540a
@@ -0,0 +1,19 @@
+addtask showworkdir
+do_showworkdir[nostamp] = "1"
+python do_showworkdir() {
+	import sys
+
+	localdata = bb.data.createCopy(d)
+	bb.data.update_data(localdata)
+
+	workdirs = open("%s/workdirs.txt" % bb.data.getVar("TMPDIR", d, 1), "a")
+	print >> workdirs, "%s" % bb.data.getVar("WORKDIR", d, True)
+	workdirs.close()
+}
+
+addtask listworkdirs
+do_listworkdirs[nostamp]= "1"
+do_listworkdirs[recrdeptask] = "do_showworkdir"
+python do_listworkdirs() {
+}
+
============================================================
--- packages/tasks/task-openmoko-feed.bb	7ef80d3236128df7070e50415a62f1b4e280d8d3
+++ packages/tasks/task-openmoko-feed.bb	5a4dbcc2848fca9059de74a31567f314ec530fdb
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Openmoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r27"
+PR = "r27.01"
 
 inherit task
 
@@ -53,5 +53,6 @@ RDEPENDS_task-openmoko-feed = "\
   diversity-nav \
   diversity-maps-taipei \
   assassin \
+  exposure \
   tangogps \
 "
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080515/dc87e5da/attachment.htm 
-------------- next part --------------
#
#
# delete "packages/openmoko-spaces"
# 
# rename "packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb"
#     to "packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb"
# 
# patch "packages/meta/meta-toolchain-openmoko.bb"
#  from [76d692ed056a9397df52f5d27a16c97f29b032cd]
#    to [f863c373260a0e447f82489950183fed3cacbca5]
# 
# patch "packages/meta/meta-toolchain.bb"
#  from [653be1fcb3f433216d391a1e48cde9fd4e56e7a3]
#    to [154f3d231b84fcfc3bb4298097864f5f205225df]
# 
# patch "packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb"
#  from [6e078fe827ecc66c076b33267168d49dfb3657ea]
#    to [602d1e114432c290bee5ea5c879d890625819c12]
#
============================================================
--- packages/meta/meta-toolchain-openmoko.bb	76d692ed056a9397df52f5d27a16c97f29b032cd
+++ packages/meta/meta-toolchain-openmoko.bb	f863c373260a0e447f82489950183fed3cacbca5
@@ -1,7 +1,11 @@
-PR = "r1"
+require meta-toolchain.bb
 
+DEPENDS += "pkgconfig-native"
+PR = "r1.01"
+
+SDK_SUFFIX = "toolchain-openmoko"
+
 TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target"
 TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host"
 
+POPULATE_SDK_EXTRA_TASK = "cp ${STAGING_BINDIR_NATIVE}/pkg-config ${SDK_OUTPUT}/${bindir}"
-require meta-toolchain.bb
-SDK_SUFFIX = "toolchain-openmoko"
============================================================
--- packages/meta/meta-toolchain.bb	653be1fcb3f433216d391a1e48cde9fd4e56e7a3
+++ packages/meta/meta-toolchain.bb	154f3d231b84fcfc3bb4298097864f5f205225df
@@ -20,6 +20,8 @@ RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${T
 
 RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
 
+POPULATE_SDK_EXTRA_TASK ?= ""
+
 do_populate_sdk() {
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
@@ -93,6 +95,8 @@ do_populate_sdk() {
 	done
 	rm -f ${SDK_OUTPUT}/${prefix}/lib/*.la
 
+	${POPULATE_SDK_EXTRA_TASK}
+
 	# Setup site file for external use
 	siteconfig=${SDK_OUTPUT}/${prefix}/site-config
 	touch $siteconfig
============================================================
--- packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb	6e078fe827ecc66c076b33267168d49dfb3657ea
+++ packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb	602d1e114432c290bee5ea5c879d890625819c12
@@ -1,16 +1,19 @@ DESCRIPTION = "Convenient scripts to be 
 DESCRIPTION = "Convenient scripts to be used with openmoko toolchain."
-PR = "r1.02"
+PR = "r1.04"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=toolchain-scripts;proto=http"
 
-S = "${WORKDIR}/toolkit"
-inherit sdk
+S = "${WORKDIR}/toolchain-scripts"
 
+do_install () {
+        install -d ${D}/${prefix}
+        cp -dr ${S}/* ${D}/${prefix}
+        find ${D} -name ".svn" | xargs rm -rf
+        rm -rf ${D}/${prefix}/patches
+}
+
+PACKAGE_ARCH = "all"
+
 FILES_${PN} = "/*"
 
+inherit sdk
-do_install () {
-        install -d ${D}/usr/local/openmoko/arm
-	cp -dr ${S}/* ${D}/usr/local/openmoko/arm
-	find ${D} -name ".svn" | xargs rm -rf
-	rm -r ${D}/usr/local/openmoko/arm/patches
-}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080515/dc87e5da/attachment-0001.htm 


More information about the commitlog mailing list