[oe-commits] org.oe.dev merge of '51d0f00ea24bf874bc2c6cba6bc21afbfaf45752'

[rwhitby commit]

merge of '51d0f00ea24bf874bc2c6cba6bc21afbfaf45752'
     and 'f972c41c1f6486c101e57f2c1ab5b141b3e90e91'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 6cc270a176a3e6552f19549c18ff3b4c3f018aa8
ViewMTN: http://monotone.openembedded.org/revision/info/6cc270a176a3e6552f19549c18ff3b4c3f018aa8
Files:
1
packages/uboot/uboot-openmoko_1.3.0+svn.bb
packages/uboot/uboot-openmoko_svn.bb
packages/openmoko-spaces
packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/tasks/task-toolchain-openmoko-sdk.bb
Diffs:

#
# mt diff -r51d0f00ea24bf874bc2c6cba6bc21afbfaf45752 -r6cc270a176a3e6552f19549c18ff3b4c3f018aa8
#
# 
# 
# rename "packages/uboot/uboot-openmoko_1.3.0+svn.bb"
#     to "packages/uboot/uboot-openmoko_svn.bb"
# 


#
# mt diff -rf972c41c1f6486c101e57f2c1ab5b141b3e90e91 -r6cc270a176a3e6552f19549c18ff3b4c3f018aa8
#
# 
# 
# add_dir "packages/openmoko-spaces"
# 
# add_file "packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb"
#  content [9ca964cafabb093788ba8d42e42e6cd2c4c01437]
# 
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
#  from [9ec0920876981474a325a47766fa7d50bbb1cfd3]
#    to [fd3ecb56d2f926384dc852689d17e18430014b2e]
# 
# patch "packages/tasks/task-toolchain-openmoko-sdk.bb"
#  from [5baf630d26e6cc447d9e9ced5601370e57f768af]
#    to [4526d09a7c1a87ae65eac1a78599062dad98e280]
# 
============================================================
--- packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb	9ca964cafabb093788ba8d42e42e6cd2c4c01437
+++ packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb	9ca964cafabb093788ba8d42e42e6cd2c4c01437
@@ -0,0 +1,15 @@
+DESCRIPTION = "Convenient scripts to be used with openmoko toolchain."
+PACKAGE_ARCH = "all"
+
+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="3563"
+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
+}
============================================================
--- packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb	9ec0920876981474a325a47766fa7d50bbb1cfd3
+++ packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb	fd3ecb56d2f926384dc852689d17e18430014b2e
@@ -8,7 +8,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 # Avoid circular dependencies from package_ipk.bbclass
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-utils"
-INSTALL += "arfile.py"
+INSTALL += "ipkg-list-fields arfile.py"
 
 do_stage() {
         for i in ${INSTALL}; do
============================================================
--- packages/tasks/task-toolchain-openmoko-sdk.bb	5baf630d26e6cc447d9e9ced5601370e57f768af
+++ packages/tasks/task-toolchain-openmoko-sdk.bb	4526d09a7c1a87ae65eac1a78599062dad98e280
@@ -26,6 +26,6 @@ RDEPENDS_${PN} = "\
     libmokoui2-dev \
     libmokopanelui2-dev \
     libmokojournal2-dev \
-    \
     openmoko-sample2-src \
+    openmoko-toolchain-scripts \
 "