From d190d03547f17df923ef4c1efabb5e863b635df9 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Wed, 19 Dec 2007 15:01:24 +0000
Subject: remove epdf from task-openmoko-feed for now.

---
 packages/tasks/task-openmoko-feed.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index e1fbbabfde..1853f6a181 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -9,7 +9,7 @@ RDEPENDS_task-openmoko-feed = "\
   aspell enchant \
   bluez-hcidump \
   bootchart \
-  eet evas ecore embryo epsilon edje efreet emotion epdf \
+  eet evas ecore embryo epsilon edje efreet emotion \
   exhibit edje-viewer \
   free42-vga \
   gpe-filemanager gpe-gallery gpe-timesheet gpe-todo \
-- 
cgit v1.2.3


From 446b31cf615d573a24a851a944872e03f3e00d40 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 20 Dec 2007 18:43:53 +0000
Subject: disapproval of revision '9784df253c04df1dfcc620c6bf064869215598f6'
 fix Bug 3502

---
 packages/ipkg/files/ipkg_bugfix.patch | 44 -----------------------------------
 packages/ipkg/ipkg-native_0.99.163.bb |  3 +--
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 packages/ipkg/files/ipkg_bugfix.patch

diff --git a/packages/ipkg/files/ipkg_bugfix.patch b/packages/ipkg/files/ipkg_bugfix.patch
deleted file mode 100644
index 51eccbb2bd..0000000000
--- a/packages/ipkg/files/ipkg_bugfix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: C/ipkg_conf.c
-===================================================================
---- C.orig/ipkg_conf.c	2005-06-21 13:59:32.000000000 +0000
-+++ C/ipkg_conf.c	2007-11-27 01:11:17.000000000 +0000
-@@ -423,6 +423,7 @@
-      nv_pair_t *nv_pair;
-      pkg_dest_t *dest;
-      char *root_dir;
-+     char *list_dir2;
- 
-      for (iter = nv_pair_list->head; iter; iter = iter->next) {
- 	  nv_pair = iter->data;
-@@ -432,8 +433,14 @@
- 	  } else {
- 	       root_dir = strdup(nv_pair->value);
- 	  }
--	  dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, lists_dir);
-+	  if (conf->offline_root) {
-+	       sprintf_alloc(&list_dir2, "%s%s", conf->offline_root, lists_dir);
-+	  } else {
-+	       list_dir2 = strdup(lists_dir);
-+	  }
-+	  dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, list_dir2);
- 	  free(root_dir);
-+	  free(list_dir2);
- 	  if (dest == NULL) {
- 	       continue;
- 	  }
-@@ -562,13 +569,13 @@
- 	  } else if (strcmp(type, "dest") == 0) {
- 	       nv_pair_list_append(tmp_dest_nv_pair_list, name, value);
- 	  } else if (strcmp(type, "lists_dir") == 0) {
--	       *lists_dir = realloc(*lists_dir,strlen(value)+1);
-+	       *lists_dir = realloc(*lists_dir,strlen(name)+1);
-                if (*lists_dir == NULL) {
- 		    ipkg_message(conf, IPKG_ERROR, "ERROR: Not enough memory\n");
- 	            free(options);
- 	            return EINVAL;
-                }
--               sprintf (*lists_dir,"%s",value);
-+               sprintf (*lists_dir,"%s", name);
- 	  } else if (strcmp(type, "arch") == 0) {
- 	       ipkg_message(conf, IPKG_INFO, "supported arch %s priority (%s)\n", name, value);
- 	       if (!value) {
diff --git a/packages/ipkg/ipkg-native_0.99.163.bb b/packages/ipkg/ipkg-native_0.99.163.bb
index c8e7d08588..13609c9037 100644
--- a/packages/ipkg/ipkg-native_0.99.163.bb
+++ b/packages/ipkg/ipkg-native_0.99.163.bb
@@ -2,7 +2,7 @@ S = "${WORKDIR}/ipkg-${PV}"
 
 #require ipkg_${PV}.bb
 require ipkg-native.inc
-PR = "r3"
+PR = "r2"
 
 inherit autotools pkgconfig native
 
@@ -10,6 +10,5 @@ SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
            file://is-processing.patch;patch=1 \
            file://1-pkg-parse--Optimize-inefficient-parsing.patch;patch=1 \
            file://2-pkg-vec--Optimize-gross-inefficiency.patch;patch=1 \
-           file://ipkg_bugfix.patch;patch=1 \
           "
 
-- 
cgit v1.2.3


From c06a4f63a7ee2ee6b4e1a8bbab0b0e86f2205d34 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 20 Dec 2007 18:52:06 +0000
Subject: Add fbset by Dodji's request.

---
 packages/tasks/task-openmoko-debug.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb
index 8486aa01cf..a6a17b3c5a 100644
--- a/packages/tasks/task-openmoko-debug.bb
+++ b/packages/tasks/task-openmoko-debug.bb
@@ -15,6 +15,7 @@ RDEPENDS_task-openmoko-debug = "\
   cu \
   dbench \
   fbgrab \
+  fbset \
   fstests \
   gdb \
   gdbserver \
-- 
cgit v1.2.3


From 805ce343e2802308a42920d4c9d2757c45e2bcaf Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 20 Dec 2007 18:53:57 +0000
Subject: Remove ipkg-list-fields because already in ipkg-utils

---
 packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index 23d73ebae6..3101ecb3be 100644
--- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -8,7 +8,7 @@ inherit native
 # Avoid circular dependencies from package_ipk.bbclass
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-utils"
-INSTALL += "ipkg-list-fields arfile.py"
+INSTALL += "arfile.py"
 
 do_stage() {
         for i in ${INSTALL}; do
-- 
cgit v1.2.3


From 66a6ef82a48cb5ca976f3686b75ee150563bc1d5 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 20 Dec 2007 20:03:01 +0000
Subject: Add ability to find the directory of parent package if the child
 package is of different arch.

---
 packages/meta/meta-toolchain.bb | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 91467e5140..4a8edb9c32 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
+PR = "r1"
 
 inherit sdk meta
 
@@ -59,8 +60,8 @@ do_populate_sdk() {
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
 
 	# remove unwanted housekeeping files
-	mv ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
-	rm -Rf ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg
+	mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+	rm -Rf ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ipkg
 	mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host
 	rm -Rf ${SDK_OUTPUT}/usr/lib
 
@@ -73,10 +74,17 @@ do_populate_sdk() {
 		for arch in $revipkgarchs; do
 			pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk
 			if [ -e $pkgnames ]; then
-				echo "Found $pkgnames"
+				oenote "Found $pkgnames"
 				cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/
 				orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
-				pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
+				pkg_subdir_postfix=${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
+				for aarch in $revipkgarchs; do
+					if [ -e "${STAGING_DIR}/pkgdata/${aarch}${pkg_subdir_postfix}/${orig_pkg}" ]; then
+						pkg_subdir="${aarch}${pkg_subdir_postfix}"
+						break
+					fi
+				done
+				oenote "Original package in ${pkg_subdir}"
 				mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime
 				cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/
 				subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-`
-- 
cgit v1.2.3


From 788b612af08a1db3e28dbf5ae21bcd039b29ef50 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 20 Dec 2007 20:20:00 +0000
Subject: 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

---
 conf/distro/include/moko-autorev.inc               |  1 +
 conf/distro/include/sane-srcrevs.inc               |  1 +
 packages/meta/meta-toolchain-openmoko.bb           |  6 +++--
 .../openmoko-toolchain-scripts_svn.bb              | 13 +++++----
 packages/openmoko2/openmoko-sample2_svn.bb         |  2 +-
 packages/tasks/task-openmoko-toolchain-host.bb     | 13 +++++++++
 packages/tasks/task-openmoko-toolchain-target.bb   | 30 +++++++++++++++++++++
 packages/tasks/task-toolchain-openmoko-sdk.bb      | 31 ----------------------
 8 files changed, 56 insertions(+), 41 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

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 74b930781b..1193fa463c 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -39,6 +39,7 @@ SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
 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}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 6e7910cf10..fd2423e08e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -112,6 +112,7 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
 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"
diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb
index 90eff20259..6ee3e0472a 100644
--- a/packages/meta/meta-toolchain-openmoko.bb
+++ b/packages/meta/meta-toolchain-openmoko.bb
@@ -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
diff --git a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
index 1526cbab55..7533f81958 100644
--- a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
+++ b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
@@ -1,15 +1,14 @@
 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
 }
diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb
index c05b6d3618..8c808ffd03 100644
--- a/packages/openmoko2/openmoko-sample2_svn.bb
+++ b/packages/openmoko2/openmoko-sample2_svn.bb
@@ -9,7 +9,7 @@ inherit openmoko2
 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
diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb
new file mode 100644
index 0000000000..788152c6ca
--- /dev/null
+++ b/packages/tasks/task-openmoko-toolchain-host.bb
@@ -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 \
+"
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


From 674ca4bf9908f7ea2324ce4c6ebc7770c652da5b Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Fri, 21 Dec 2007 10:38:42 +0000
Subject: Comment out the RPROVIDES line as a workaround of Bug 3509

---
 packages/meta/external-toolchain.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb
index c483ea26a6..4e830435c4 100644
--- a/packages/meta/external-toolchain.bb
+++ b/packages/meta/external-toolchain.bb
@@ -15,7 +15,7 @@ PROVIDES = "\
     virtual/linux-libc-headers \
     "
 
-RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+#RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
 PACKAGES_DYNAMIC = "glibc-gconv-*"
 PR = "r1"
 
-- 
cgit v1.2.3


From 76a69ddbfb3b9490e7a7fb45b77d00a3f559bc3c Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Wed, 26 Dec 2007 12:53:31 +0000
Subject: make it possible to INHERIT += 'sourcepkg' during OM build by:   *
 bypass most of the sourcepkg.bbclass errors   * update
 packages/linux/linux-openmoko_2.6.22.5.bb to make it work with     sourcepkg.

---
 classes/sourcepkg.bbclass                 | 43 ++++++++++++++++++++++---------
 packages/linux/linux-openmoko_2.6.22.5.bb | 22 ++++++++++------
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
index bbc9f187ec..f7daa9f46c 100644
--- a/classes/sourcepkg.bbclass
+++ b/classes/sourcepkg.bbclass
@@ -18,14 +18,20 @@ def get_src_tree(d):
 		bb.error("S not defined, unable to find source tree.")
 		return
 
-	s_tree_raw = s.split('/')[1]
+	try:
+		s_tree_raw = s.split('/')[1]
+	except IndexError:
+		return
+
 	s_tree = bb.data.expand(s_tree_raw, d)
 
 	src_tree_path = os.path.join(workdir, s_tree)
 	try:
 		os.listdir(src_tree_path)
 	except OSError:
-		bb.fatal("Expected to find source tree in '%s' which doesn't exist." % src_tree_path)
+		bb.error("Expected to find source tree in '%s' which doesn't exist." % src_tree_path, s)
+		return
+
 	bb.debug("Assuming source tree is '%s'" % src_tree_path)
 
 	return s_tree
@@ -39,11 +45,14 @@ sourcepkg_do_create_orig_tgz(){
 	done
 
 	src_tree=${@get_src_tree(d)}
-	
-	echo $src_tree
+	if test x${src_tree} = x; then
+		oenote "Skipping empty source tree"
+		return
+	fi
+
 	oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
 	tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree
-	cp -pPR $src_tree $src_tree.orig
+	cp -av $src_tree $src_tree.orig
 }
 
 sourcepkg_do_archive_bb() {
@@ -74,7 +83,14 @@ python sourcepkg_do_dumpdata() {
 	bb.note("Dumping metadata into '%s'" % dumpfile)
 	f = open(dumpfile, "w")
 	# emit variables and shell functions
-        bb.data.emit_env(f, d, True)
+
+	# FIXME: if we emit all, bitbake will get error while
+	# evaluating AUTOREV since we have AUTOREV =
+	# "${@bb.fetch.get_srcrev(d)}" in bitbake.conf, but get_srcrev
+	# without a valid SRC_URI will cause problem.
+
+	bb.data.emit_env(f, d, True)
+
 	# emit the metadata which isnt valid shell
 	for e in d.keys():
 		if bb.data.getVarFlag(e, 'python', d):
@@ -89,8 +105,11 @@ sourcepkg_do_create_diff_gz(){
 		echo $i >> temp/exclude-from-file
 	done
 
-
 	src_tree=${@get_src_tree(d)}
+	if test x${src_tree} = x; then
+		oenote "Skipping empty source tree"
+		return
+	fi
 
 	for i in `find . -maxdepth 1 -type f`; do
 		mkdir -p $src_tree/${DISTRO}/files
@@ -102,10 +121,10 @@ sourcepkg_do_create_diff_gz(){
 	rm -rf $src_tree.orig
 }
 
-EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
+#EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
+EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_create_diff_gz
 
 addtask create_orig_tgz after do_unpack before do_patch
-addtask archive_bb after do_patch before do_dumpdata
-addtask dumpdata after do_archive_bb before do_create_diff_gz
-addtask create_diff_gz after do_dump_data before do_configure
-
+addtask archive_bb after do_patch before do_configure
+#addtask dumpdata after do_archive_bb before do_configure
+addtask create_diff_gz after do_archive_bb before do_configure
diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb
index d1b3c5ef1e..2dd535725b 100644
--- a/packages/linux/linux-openmoko_2.6.22.5.bb
+++ b/packages/linux/linux-openmoko_2.6.22.5.bb
@@ -61,12 +61,18 @@ module_autoload_snd-mixer-oss = "snd-mixer-oss"
 # sd/mmc
 module_autoload_s3cmci = "s3cmci"
 
-do_prepatch() {
-        mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
-        mv patches patches.openmoko
-        mv .pc .pc.old
-        mv ${WORKDIR}/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig
+python do_patch_prepend() {
+	def runcmd(cmd):
+		import commands
+		(status, output) = commands.getstatusoutput(cmd)
+		if status != 0:
+			raise Exception, "Status %i: %s" % (status >> 8, output)
+		return output
+	runcmd('mv %(WORKDIR)s/patches %(S)s/patches && cd %(S)s && '
+	       'quilt push -av && mv patches patches.openmoko && '
+	       'mv .pc .pc.old && mv %(WORKDIR)s/defconfig-%(KERNEL_RELEASE)s %(WORKDIR)s/defconfig' %
+	       {'WORKDIR': bb.data.getVar('WORKDIR', d, 1),
+		'S': bb.data.getVar('S', d, 1),
+		'KERNEL_RELEASE': bb.data.getVar('KERNEL_RELEASE', d, 1)})
+	del runcmd
 }
-
-addtask prepatch after do_unpack before do_patch
-
-- 
cgit v1.2.3


From ec9ece86db37e1e071208787c58272371d557082 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Mon, 7 Jan 2008 13:28:46 +0000
Subject: disable autorev openmoko-terminal2 for now to recover daily build.

---
 conf/distro/include/moko-autorev.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 1193fa463c..63a4b55dd2 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -34,7 +34,7 @@ SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
+#SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
-- 
cgit v1.2.3


From 2a5a1309888b7e49e5656e8abde6adbff298b451 Mon Sep 17 00:00:00 2001
From: Dojii Seketeli <dodji@openedhand.com>
Date: Tue, 8 Jan 2008 09:17:23 +0000
Subject: Get Xglamo from http://cgit.freedesktop.org/~dodji/xglamo

---
 packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index f78bef05ae..cdf74ee821 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,9 +3,10 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r21"
+PR = "r22"
 
-SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
+#SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
+SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;tag=master \
 	${KDRIVE_COMMON_PATCHES} \
 	file://enable-epson.patch;patch=1 \
 	file://enable-builtin-fonts.patch;patch=1 \
@@ -21,11 +22,12 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	file://w100-fix-offscreen-bmp.patch;patch=1 \
         file://kdrive-1.3-18bpp.patch;patch=1 \
         file://gumstix-kmode.patch;patch=1 \
-        file://smedia-glamo.patch;patch=1 \
-        file://build-glamo.patch;patch=1 \
 "
 
 S = "${WORKDIR}/xorg-server-${PV}"
+#S = "${WORKDIR}/git"
+
+#CFLAGS=-g
 
 W100_OECONF = "--disable-w100"
 W100_OECONF_arm = "--enable-w100"
-- 
cgit v1.2.3


From fc6f8419e5eed8f16a9fefd193c94c08c26024fd Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Wed, 9 Jan 2008 12:31:53 +0000
Subject: remove glamo-report-vram-size-to-userspace.patch to reflect OM svn
 change.

---
 packages/linux/linux-openmoko_2.6.22.5.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb
index 2dd535725b..7cf8e0ac9f 100644
--- a/packages/linux/linux-openmoko_2.6.22.5.bb
+++ b/packages/linux/linux-openmoko_2.6.22.5.bb
@@ -29,7 +29,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.ta
            file://iis-suspend.patch;patch=1 \
            file://s3c24xx-pcm-suspend.patch;patch=1 \
            file://gta-vibro-pwm-suspend.patch;patch=1 \
-           file://glamo-report-vram-size-to-userspace.patch;patch=1 \
            file://defconfig-${KERNEL_RELEASE}"
 
 S = "${WORKDIR}/linux-${VANILLA_VERSION}"
-- 
cgit v1.2.3


From 5f85023a55c3e444f6e53dd77de449f8c2f3ef34 Mon Sep 17 00:00:00 2001
From: Dojii Seketeli <dodji@openedhand.com>
Date: Wed, 9 Jan 2008 19:50:00 +0000
Subject: [xserver-kdrive-kdrive] properly set the S variable. Now that xserver
 is taken from http://cgit.freedesktop.org/~dodji/xglamo the S variable has to
 be updated. Cleaned up the recipe file as well.

---
 packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 86af843d7b..e3bb271ef2 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -24,11 +24,8 @@ SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;tag=master \
         file://gumstix-kmode.patch;patch=1 \
 "
 
-S = "${WORKDIR}/xorg-server-${PV}"
-
-#S = "${WORKDIR}/git"
-
-#CFLAGS=-g
+#S = "${WORKDIR}/xorg-server-${PV}"
+S = "${WORKDIR}/git"
 
 W100_OECONF = "--disable-w100"
 W100_OECONF_arm = "--enable-w100"
-- 
cgit v1.2.3


From 7a0aae1895e7e3f857b3ce44a8da1fc7fb2ca30a Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 17 Jan 2008 11:26:51 +0000
Subject: enable openmoko-terminal2 AUTOREV

---
 conf/distro/include/moko-autorev.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 671babe1af..eb0a403fb3 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -34,7 +34,7 @@ SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
-#SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
-- 
cgit v1.2.3


From 9f058b138073ef753c5094e3927c963c7a655f97 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 17 Jan 2008 11:29:23 +0000
Subject: update SRCREV_pn-openmoko-toolchain-scripts ?= "3767"

---
 conf/distro/include/sane-srcrevs.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f8516d2fc6..aa13d4b255 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -112,7 +112,7 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
 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-toolchain-scripts ?= "3767"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
-- 
cgit v1.2.3


From c935f9d9549680e950ad5e66d8661ce4e9584ae3 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 17 Jan 2008 11:32:09 +0000
Subject: stage geoclue and gypsy for later usage.

---
 packages/geoclue/geoclue_git.bb | 4 ++++
 packages/gypsy/gypsy.inc        | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/packages/geoclue/geoclue_git.bb b/packages/geoclue/geoclue_git.bb
index bd6778213a..b4a0cbda3a 100644
--- a/packages/geoclue/geoclue_git.bb
+++ b/packages/geoclue/geoclue_git.bb
@@ -20,6 +20,10 @@ EXTRA_OECONF = " --enable-applet=no \
                  --enable-gpsd \
 		 --enable-system-bus"
 
+do_stage() {
+	autotools_stage_all
+}
+
 do_install_append() {
 	mkdir -p ${D}/usr/share/
 	cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share
diff --git a/packages/gypsy/gypsy.inc b/packages/gypsy/gypsy.inc
index 6d78943bd5..77797151ff 100644
--- a/packages/gypsy/gypsy.inc
+++ b/packages/gypsy/gypsy.inc
@@ -5,6 +5,10 @@ DEPENDS = "glib-2.0 dbus bluez-libs"
 
 inherit autotools pkgconfig
 
+do_stage () {
+	autotools_stage_all
+}
+
 do_configure_prepend () {
 	touch ${S}/gtk-doc.make
 }
-- 
cgit v1.2.3


From d47eb6e254cea2207027b75b2ec071f0d3dc7d61 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Tue, 22 Jan 2008 03:48:03 +0000
Subject: task-openmoko-toolchain-host.bb: remove it to resolve conflict
 a250ef0b1707ead866fe051ca88c56e538d51bfb

---
 packages/tasks/task-openmoko-toolchain-host.bb | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 packages/tasks/task-openmoko-toolchain-host.bb

diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb
deleted file mode 100644
index 788152c6ca..0000000000
--- a/packages/tasks/task-openmoko-toolchain-host.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-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 \
-"
-- 
cgit v1.2.3


From 197a36f6add53d65332aa4dd33bc013270b6c927 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Tue, 22 Jan 2008 04:02:59 +0000
Subject: task-openmoko-toolchain-host: fix duplicated text.  * duplicated text
 due to brain damaged patch usage.

---
 packages/tasks/task-openmoko-toolchain-host.bb | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb
index 31ac3bb746..788152c6ca 100644
--- a/packages/tasks/task-openmoko-toolchain-host.bb
+++ b/packages/tasks/task-openmoko-toolchain-host.bb
@@ -11,16 +11,3 @@ 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 \
-"
-- 
cgit v1.2.3


From 75c94213fe3bce68b3e787842eb65a8ff004c9ce Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Wed, 23 Jan 2008 10:31:22 +0000
Subject: swt-gtk: fix dependency and possible cross compiling badness * need
 classpath to build * remove -I${JAVA_HOME}/include and
 -I${JAVA_HOME}/include/linux because   it might cause error with or without
 JAVA_HOME set and no extra include   files are required anyway.

---
 packages/swt/files/make_linux-fix.patch | 22 ++++++++++++++++++++++
 packages/swt/swt-gtk.inc                |  2 +-
 packages/swt/swt3.4-gtk_3.3+3.4M3.bb    |  3 ++-
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 packages/swt/files/make_linux-fix.patch

diff --git a/packages/swt/files/make_linux-fix.patch b/packages/swt/files/make_linux-fix.patch
new file mode 100644
index 0000000000..1c98f5cad2
--- /dev/null
+++ b/packages/swt/files/make_linux-fix.patch
@@ -0,0 +1,22 @@
+Index: swt-source/make_linux.mak
+===================================================================
+--- swt-source.orig/make_linux.mak	2008-01-23 15:08:02.000000000 +0800
++++ swt-source/make_linux.mak	2008-01-23 15:08:21.000000000 +0800
+@@ -74,8 +74,6 @@
+ 	-Wno-non-virtual-dtor \
+ 	-fPIC \
+ 	-I. \
+-	-I$(JAVA_HOME)/include \
+-	-I$(JAVA_HOME)/include/linux \
+ 	${SWT_PTR_CFLAGS}
+ MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
+ MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup
+@@ -96,8 +94,6 @@
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DLINUX -DGTK \
+-		-I$(JAVA_HOME)/include \
+-		-I$(JAVA_HOME)/include/linux \
+ 		-fPIC \
+ 		${SWT_PTR_CFLAGS}
+ LIBS = -shared -fPIC
diff --git a/packages/swt/swt-gtk.inc b/packages/swt/swt-gtk.inc
index 6afadf1cab..4522e57503 100644
--- a/packages/swt/swt-gtk.inc
+++ b/packages/swt/swt-gtk.inc
@@ -3,7 +3,7 @@ LICENSE = "CPL MPL LGPL"
 
 inherit java-library
 
-DEPENDS = "cairo gtk+ atk libxtst"
+DEPENDS = "cairo gtk+ atk libxtst classpath"
 
 S = "${WORKDIR}/swt-source"
 
diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
index 5d411f1be6..701339d374 100644
--- a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
+++ b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
@@ -1,7 +1,8 @@
 require swt-gtk.inc
 
 SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip \
-           file://Makefile"
+           file://Makefile \
+	   file://make_linux-fix.patch;patch=1"
 
 # A number which is used by SWT to mark the shared libraries.
 SWTVERSION = "3416"
-- 
cgit v1.2.3


From 23aab076251c65c283cb8d98fa1183179c3333ba Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Wed, 23 Jan 2008 10:34:54 +0000
Subject: task-openmoko-feed: add swt and cacao * swt3.4-gtk * cacao
 openmoko.conf: set preferred provider to avoid bitbake confusion building
 swt3.4-gtk.

---
 conf/distro/openmoko.conf            | 5 ++++-
 packages/tasks/task-openmoko-feed.bb | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index dd6c2e0b7e..a1250afcb3 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -64,7 +64,10 @@ PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}"
 PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
 PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
 
+# for jalimo
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+
 # deploy gta01 and gta02 in ${MACHINE_CLASS} directory
 DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
 DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
-
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 97f24a7624..1e52beaa42 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -34,5 +34,6 @@ RDEPENDS_task-openmoko-feed = "\
   vnc \
   wxwidgets \
   x11vnc \
+  swt3.4-gtk \
+  cacao \
 "
-
-- 
cgit v1.2.3


From 2cd6d66602fd923fe15eea56bf7f4383790fbfce Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Wed, 23 Jan 2008 11:47:55 +0000
Subject: gpsdrive: update download URI *
 http://bugs.openembedded.net/show_bug.cgi?id=3494 * update checksums.ini
 accordingly

---
 conf/checksums.ini                     | 2 +-
 packages/gpsdrive/gpsdrive_2.10pre2.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d9c9b5080c..5053d9e5d1 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -4218,7 +4218,7 @@ sha256=e6a055689ad05f6adba7dbb9490891a18a240d1a30e34424b3a034f4152f2c28
 md5=1ad07e10f34e46ffdaf10688743f2f43
 sha256=39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8
 
-[http://www.gpsdrive.cc/gpsdrive-2.10pre2.tar.gz]
+[http://www.gpsdrive.de/packages/gpsdrive-2.10pre2.tar.gz]
 md5=28b13b7253c8f019433be68686070558
 sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227
 
diff --git a/packages/gpsdrive/gpsdrive_2.10pre2.bb b/packages/gpsdrive/gpsdrive_2.10pre2.bb
index 675c556b6f..f44c5925d2 100644
--- a/packages/gpsdrive/gpsdrive_2.10pre2.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre2.bb
@@ -9,7 +9,7 @@ SECTION = "x11"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.gpsdrive.de/${PN}-${PV}.tar.gz \
+SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive.desktop"
 
 CFLAGS += "-D_GNU_SOURCE"
-- 
cgit v1.2.3


From d6402b5e506137618aeeb37016bdd9db4c3eb65b Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 24 Jan 2008 06:33:02 +0000
Subject: external-toolchain: enable RPROVIDES again * the external-toolchain
 RPROVIDES problem is gone with bitbake 1.8.10 * see Bug#3509

---
 packages/meta/external-toolchain.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb
index 69f16b10df..47d9a93a15 100644
--- a/packages/meta/external-toolchain.bb
+++ b/packages/meta/external-toolchain.bb
@@ -15,7 +15,7 @@ PROVIDES = "\
     virtual/linux-libc-headers \
     "
 
-#RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
 PACKAGES_DYNAMIC = "glibc-gconv-*"
 PR = "r1"
 
-- 
cgit v1.2.3


From 404f0f79366aaf13b3f518e8db9d9192cdc74287 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 24 Jan 2008 06:34:54 +0000
Subject: openmoko.conf: add PREFERRED_PROVIDER_swt3.4-gtk

---
 conf/distro/openmoko.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index a1250afcb3..d7b3cf753a 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -67,6 +67,7 @@ PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
 # for jalimo
 PREFERRED_PROVIDER_classpath = "classpath"
 PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
 
 # deploy gta01 and gta02 in ${MACHINE_CLASS} directory
 DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
-- 
cgit v1.2.3


From f65ddd6270f70779f3edc4e82d1d14814b3fb8ce Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Thu, 24 Jan 2008 06:41:40 +0000
Subject: task-openmoko-feed: fix incorrect RDEPENDS * from swt3.4-gtk to
 libswt3.4-gtk-java * increase PR

---
 packages/tasks/task-openmoko-feed.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 1e52beaa42..8e09b3f215 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r20"
+PR = "r21"
 
 inherit task
 
@@ -34,6 +34,6 @@ RDEPENDS_task-openmoko-feed = "\
   vnc \
   wxwidgets \
   x11vnc \
-  swt3.4-gtk \
+  libswt3.4-gtk-java \
   cacao \
 "
-- 
cgit v1.2.3


From c7647ffd1065e46540c2d945515057c75283cad7 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Fri, 25 Jan 2008 08:40:12 +0000
Subject: openmoko-panel-memory: shows an out-of-memory warning in the OpenMoko
 panel * add entry in moko-autorev.inc * add entry in sane-srcrevs.inc

---
 conf/distro/include/moko-autorev.inc                         | 1 +
 conf/distro/include/sane-srcrevs.inc                         | 1 +
 packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb | 7 +++++++
 3 files changed, 9 insertions(+)
 create mode 100644 packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index c5390811c6..ad3202ea36 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -30,6 +30,7 @@ SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
+SRCREV_pn-openmoko-panel-memory ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index fd081635e0..7a76297256 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -95,6 +95,7 @@ SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
 SRCREV_pn-openmoko-panel-gps ?= "2900"
 SRCREV_pn-openmoko-panel-gsm ?= "3664"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
+SRCREV_pn-openmoko-panel-memory ?= "3903"
 SRCREV_pn-openmoko-panel-usb ?= "3360"
 SRCREV_pn-openmoko-sample2 ?= "3528"
 SRCREV_pn-openmoko-session ?= "152"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
new file mode 100644
index 0000000000..8e8af7a086
--- /dev/null
+++ b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Shows an out-of-memory warning in the OpenMoko panel"
+DEPENDS = "libnotify"
+RDEPENDS = "openmoko-dialer2"
+PV = "0.0.0+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko-panel-plugin
-- 
cgit v1.2.3


From 3302b455a6bb18c031bff85eed8b71d99e07a81c Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Fri, 25 Jan 2008 08:42:51 +0000
Subject: openmoko-launcher: add a slim application launcher * add entry in
 moko-autorev.inc * add entry in sane-srcrevs.inc

---
 conf/distro/include/moko-autorev.inc        | 1 +
 conf/distro/include/sane-srcrevs.inc        | 1 +
 packages/openmoko2/openmoko-launcher_svn.bb | 7 +++++++
 3 files changed, 9 insertions(+)
 create mode 100644 packages/openmoko2/openmoko-launcher_svn.bb

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index ad3202ea36..91b83506e6 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -22,6 +22,7 @@ SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}"
+SRCREV_pn-openmoko-launcher ?= "${AUTOREV}"
 SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7a76297256..0cdbc2fe44 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -83,6 +83,7 @@ SRCREV_pn-openmoko-icon-theme-standard ?= "2232"
 SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247"
 SRCREV_pn-openmoko-keyboard ?= "1631"
+SRCREV_pn-openmoko-launcher ?= "3942"
 SRCREV_pn-openmoko-libs ?= "2367"
 SRCREV_pn-openmoko-mediaplayer2 ?= "3583"
 SRCREV_pn-openmoko-messages ?= "2276"
diff --git a/packages/openmoko2/openmoko-launcher_svn.bb b/packages/openmoko2/openmoko-launcher_svn.bb
new file mode 100644
index 0000000000..5f97e3e65f
--- /dev/null
+++ b/packages/openmoko2/openmoko-launcher_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "The OpenMoko Application Launcher (simple)"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokoui2 startup-notification libice libsm"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2 gtk-icon-cache 
-- 
cgit v1.2.3


From 8522a5179c40803bbdc4a8ded8a6e3c635de2242 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Fri, 25 Jan 2008 08:45:10 +0000
Subject: openmoko-session2: add openmoko-panel-memory * also add
 openmoko-panel-memory into task-openmoko-phone

---
 packages/openmoko2/openmoko-session2.bb                   | 2 +-
 packages/openmoko2/openmoko-session2/etc/matchbox/session | 2 +-
 packages/tasks/task-openmoko-phone.bb                     | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 3d8c9109e1..02489f5621 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -4,7 +4,7 @@ SECTION = "x11"
 RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-PR = "r63"
+PR = "r64"
 
 SRC_URI = "\
   file://etc \
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index 9eea32a45d..f4d1ee9b11 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -7,6 +7,6 @@ phone-kit &
 matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
 
 matchbox-panel-2 --start-applets systray,startup \
-  --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,keyboard --titlebar &
+  --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-memory,keyboard --titlebar &
 
 exec neod
diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb
index 49e4e66859..474efff79d 100644
--- a/packages/tasks/task-openmoko-phone.bb
+++ b/packages/tasks/task-openmoko-phone.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r72"
+PR = "r73"
 
 inherit task
 
@@ -14,5 +14,6 @@ RDEPENDS_task-openmoko-phone = "\
   libgsmd-tools \
   openmoko-dialer2 \
   openmoko-panel-gsm \
+  openmoko-panel-memory \
 #  ppp \
 "
-- 
cgit v1.2.3


From bb5a2f9f2aecb2c088eece5ceeef3228eee943dd Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Fri, 25 Jan 2008 08:54:31 +0000
Subject: multitap-pad: multi-tap input method for GTK * update moko-autorev
 and sane-srcrevs accordingly.

---
 conf/distro/include/moko-autorev.inc       |  2 ++
 conf/distro/include/sane-srcrevs.inc       |  1 +
 packages/multitap-pad/.mtn2git_empty       |  0
 packages/multitap-pad/files/.mtn2git_empty |  0
 packages/multitap-pad/files/80multitappad  | 20 +++++++++++++
 packages/multitap-pad/multitap-pad_svn.bb  | 47 ++++++++++++++++++++++++++++++
 6 files changed, 70 insertions(+)
 create mode 100644 packages/multitap-pad/.mtn2git_empty
 create mode 100644 packages/multitap-pad/files/.mtn2git_empty
 create mode 100644 packages/multitap-pad/files/80multitappad
 create mode 100644 packages/multitap-pad/multitap-pad_svn.bb

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 91b83506e6..e65008be02 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -10,6 +10,8 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
 
+SRCREV_pn-multitap-pad ?= "${AUTOREV}"
+
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 0cdbc2fe44..ae1fb8e4dc 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -55,6 +55,7 @@ SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-moko-gtk-engine ?= "3405"
 SRCREV_pn-mpd-alsa ?= "6952"
+SRCREV_pn-multitap-pad ?= "337"
 SRCREV_pn-neod ?= "3421"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
diff --git a/packages/multitap-pad/.mtn2git_empty b/packages/multitap-pad/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/multitap-pad/files/.mtn2git_empty b/packages/multitap-pad/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/multitap-pad/files/80multitappad b/packages/multitap-pad/files/80multitappad
new file mode 100644
index 0000000000..d2b12ea7cc
--- /dev/null
+++ b/packages/multitap-pad/files/80multitappad
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+CMD=""
+
+if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
+    if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
+        CMD="multitap-pad -d -o landscape"
+    elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
+        CMD="multitap-pad -d -o portrait"
+    fi
+else
+    CMD="multitap-pad -d"
+fi
+
+
+# Delay to make sure the window manager is active
+
+if [ "$CMD" ]; then
+    (sleep 2 && $CMD) &
+fi
diff --git a/packages/multitap-pad/multitap-pad_svn.bb b/packages/multitap-pad/multitap-pad_svn.bb
new file mode 100644
index 0000000000..7543a44d72
--- /dev/null
+++ b/packages/multitap-pad/multitap-pad_svn.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "Multi-tap input method for GTK"
+LICENSE = "GPL"
+DEPENDS = "libfakekey gtk+ matchbox-panel-2"
+RCONFLICTS = matchbox-keyboard-inputmethod
+SECTION = "x11"
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \
+	file://80multitappad"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} = "${bindir}/* \
+               ${libdir} \
+	       ${sysconfdir} \
+	       ${datadir}"
+
+FILES_${PN}-dbg += " ${libdir}/gtk-2.0/2.10.0/immodules/.debug \
+                     ${libdir}/matchbox-panel/.debug"
+
+FILES_${PN}-dev += " ${libdir}/gtk-2.0/2.10.0/immodules/*.a \
+                     ${libdir}/gtk-2.0/2.10.0/immodules/*.la \
+		     ${libdir}/matchbox-panel/*.a \
+		     ${libdir}/matchbox-panel/*.la"
+
+do_install_append () {
+	install -d ${D}/${sysconfdir}/X11/Xsession.d/
+	install -m 755 ${WORKDIR}/80multitappad ${D}/${sysconfdir}/X11/Xsession.d/
+}
+
+pkg_postinst_multitap-pad () {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pkg_postrm_multitap-pad () {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
-- 
cgit v1.2.3


From f095a17f30e2cdf4e03e99944296e7b6ed8bd86d Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Fri, 25 Jan 2008 08:57:22 +0000
Subject: task-openmoko-base: replace matchbox-keyboard-inputmethod with
 multitap-pad

---
 packages/tasks/task-openmoko-base.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb
index a5d13e7e08..07e6a474bb 100644
--- a/packages/tasks/task-openmoko-base.bb
+++ b/packages/tasks/task-openmoko-base.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: Base Task for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r71"
+PR = "r72"
 
 inherit task
 
@@ -12,10 +12,11 @@ DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, App
 RDEPENDS_task-openmoko-base = "\
   matchbox-panel-2 \
   matchbox-panel-2-applets \
-  matchbox-keyboard-inputmethod \
+#  matchbox-keyboard-inputmethod \
   matchbox-keyboard-im \
   matchbox-keyboard-applet \
   matchbox-stroke \
+  multitap-pad \
   openmoko-terminal2 \
 #  openmoko-keyboard \
   openmoko-panel-battery \
-- 
cgit v1.2.3


From 2e1c8e059c2c3879d61f13741987dc1bb066aa26 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Fri, 25 Jan 2008 09:03:27 +0000
Subject: libwww-perl: add libwww-perl and native

---
 packages/perl/libwww-perl-native_5.808.bb |  5 +++++
 packages/perl/libwww-perl_5.808.bb        | 12 ++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 packages/perl/libwww-perl-native_5.808.bb
 create mode 100644 packages/perl/libwww-perl_5.808.bb

diff --git a/packages/perl/libwww-perl-native_5.808.bb b/packages/perl/libwww-perl-native_5.808.bb
new file mode 100644
index 0000000000..68fdcbbbe5
--- /dev/null
+++ b/packages/perl/libwww-perl-native_5.808.bb
@@ -0,0 +1,5 @@
+SECTION = "libs"
+
+inherit native
+
+require libwww-perl_${PV}.bb
diff --git a/packages/perl/libwww-perl_5.808.bb b/packages/perl/libwww-perl_5.808.bb
new file mode 100644
index 0000000000..2bea48a2d0
--- /dev/null
+++ b/packages/perl/libwww-perl_5.808.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web"
+SECTION = "libs"
+LICENSE = "Artistic"
+DEPENDS = "liburi-perl-native"
+RDEPENDS = "liburi-perl"
+PR = "r1"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz"
+
+S = "${WORKDIR}/libwww-perl-${PV}"
+
+inherit cpan
-- 
cgit v1.2.3


From 5d79ce882fd10ea123db5681f4a1af9ae7de8f69 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Fri, 25 Jan 2008 10:53:04 +0000
Subject: gpsdrive: add 2.10pre4 *
 http://bugs.openembedded.org/show_bug.cgi?id=3670 * plus some polishment

---
 packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty |   0
 .../gpsdrive-2.10pre4-openstreetmap-download.patch | 128 +++++++++++++++++++++
 .../gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch  |  18 +++
 .../gpsdrive-remove-hardcoded-paths.patch          |  96 ++++++++++++++++
 .../gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop    |  10 ++
 packages/gpsdrive/gpsdrive_2.10pre4.bb             |  42 +++++++
 6 files changed, 294 insertions(+)
 create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty
 create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
 create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
 create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
 create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
 create mode 100644 packages/gpsdrive/gpsdrive_2.10pre4.bb

diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty b/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
new file mode 100644
index 0000000000..878cb1dba9
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
@@ -0,0 +1,128 @@
+diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl
+--- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl	2008-01-04 19:01:35.000000000 +0100
+@@ -35,6 +35,7 @@
+ modified (Jul 2005) by Jaroslaw Zachwieja <grok\@filippa.org.uk>
+ modified (Dec 2005) by David Pollard <david dot pollard\@optusnet.com.au>
+ modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl>
++modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support)
+ Version svn-$Version
+ ";
+ 
+@@ -176,6 +177,25 @@
+       15812 => 3 ,
+       7906  => 2,
+       3953 => 1
++    },
++    openstreetmap_tah => {
++      256*576000 =>  1,
++      128*576000 =>  2,
++       64*576000 =>  3,
++       32*576000 =>  4,
++       16*576000 =>  5,
++        8*576000 =>  6,
++        4*576000 =>  7,
++        2*576000 =>  8,
++          576000 =>  9,
++          288000 => 10,
++          144000 => 11,
++           72000 => 12,
++           36000 => 13,
++           18000 => 14,
++           9000  => 15,
++            4500 => 16,
++            2250 => 17
+     }
+ };
+ 
+@@ -331,7 +351,6 @@
+     exit();
+ }
+ 
+-
+ # Verify that we have the options that we need 
+ pod2usage(1) if (&error_check);
+ 
+@@ -417,6 +436,13 @@
+     print "+-----------------------------------------------------------+\n";
+     print "| Landsat Maps are Copyright, .....   |\n";
+     print "| They are free for non commercial use.                     |\n";
++}elsif ( $mapserver eq 'openstreetmap_tah' ){
++    print "+-----------------------------------------------------------+\n";
++    print "| OpenStreetmap Maps are Copyright by the OpenStreetmap     |\n";
++    print "| project.                                                  |\n";
++    print "| They are free for use under the terms of the              |\n";
++    print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\"    |\n";
++    print "| license. See http://www.openstreetmap.org for details.    |\n";
+ } elsif ( ! $force) {
+     print "You are violating the map servers copyright!\n";
+     print "Are you sure you want to continue? [y|n] ";
+@@ -700,6 +726,11 @@
+     {
+ 	($url,$mapscale)=googlemap_url($lati,$long,$scale);
+     } 
++    elsif ( $mapserver eq 'openstreetmap_tah') 
++    {	
++	$filename=~s/\.gif/.png/;
++	($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale);
++    } 
+     else 
+     {
+ 	print "Unknown map sever :", $mapserver, "\n"; 
+@@ -935,6 +966,37 @@
+     return ($url,$mapscale);
+ }
+ 
++#############################################################################
++sub openstreetmap_tah_url($$$){
++    my $lati = shift;
++    my $long = shift;
++    my $scale = shift;
++
++    my $mapscale = $scale;
++    my $zoom = undef;
++    for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) {
++	next unless $s == $scale;
++	$zoom = $Scale2Zoom->{openstreetmap_tah}->{$s};
++	$mapscale = $s;
++	last;
++    }
++
++    unless ( $zoom ) {
++	print "Error calculating Zoomlevel for Scale: $scale\n";
++	return (undef,undef);
++    }
++
++    if ($debug) {
++	print "\n";
++	print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n";
++	print "lat: $lati\n";
++	print "lon: $long\n";
++    }
++
++    my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png";
++#   print "$url\n";
++    return ($url,$mapscale);
++}
+ 
+ #############################################################################
+ sub eniro_url($$$){
+@@ -2284,7 +2346,7 @@
+ =item B<--mapserver <MAPSERVER>>
+ 
+ Mapserver to download from. Default: 'expedia'.
+-Currently can use: landsat or expedia.
++Currently usable: landsat, expedia or openstreetmap_tah.
+ 
+ geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs, 
+ but they are !!!NOT!!!! in the right scale.
+@@ -2294,6 +2356,9 @@
+ 
+ landsat covers the whole world with satelite Photos
+ 
++openstreetmap_tah: Free maps from the OpenStreetmap Tiles@Home project, see 
++		   http://www.openstreetmap.org and http://tah.openstreetmap.org.
++
+ gov_au is for Australia
+ 
+ incrementp for japanese Maps
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
new file mode 100644
index 0000000000..c51c80931c
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
@@ -0,0 +1,18 @@
+Index: src/map_handler.c
+===================================================================
+--- aa/src/map_handler.c	(Revision 1699)
++++ aa/src/map_handler.c	(Revision 1700)
+@@ -660,9 +660,12 @@
+   if (maploaded)
+     gdk_pixbuf_unref (image);
+ 
++#ifdef MAPNIK
+   if ( !strcmp (filename,"mapnik") ) {
+ 	  limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
+-  } else {
++  } else 
++#endif
++  {
+ 	  limage = gdk_pixbuf_new_from_file (filename, NULL);
+ 	  if (limage == NULL)
+ 	    {
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
new file mode 100644
index 0000000000..c8c0fe9c6a
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
@@ -0,0 +1,96 @@
+diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am
+--- gpsdrive-2.10pre4.orig/src/Makefile.am	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/src/Makefile.am	2007-12-28 18:50:29.000000000 +0100
+@@ -14,14 +14,14 @@
+ 	-DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \
+ 	-DLIBDIR=\"${libdir}\" \
+ 	-DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \
+-	${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\
+-	-I/usr/include/ \
+-	-I/usr/local/include \
+-	-I/opt/boost_1_35/include/boost-1_35 \
+-	-I/usr/local/include/freetype2 \
+-	-I/usr/include/freetype2 \
++	${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}
++#	-I/usr/include/ \
++#	-I/usr/local/include \
++#	-I/opt/boost_1_35/include/boost-1_35 \
++#	-I/usr/local/include/freetype2 \
++#	-I/usr/include/freetype2 \
+ 	-I. \
+-	-L/usr/local/lib
++#	-L/usr/local/lib
+ 
+ #	-I/usr/include/dbus-1.0/ 
+ 
+diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure
+--- gpsdrive-2.10pre4.orig/configure	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/configure	2008-01-06 14:49:11.000000000 +0100
+@@ -35950,10 +35950,13 @@
+ #  Yep, its ebil, but I does not know better...
+ #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
+ # default on debian should be: /usr/share/perl5/
+-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
+ #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
+-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
+ 
++# hard code path for OpenEmbedded environment as I don't know a way
++# to detect it automatically
++PERL_PACKAGE_DIR="/usr/share/perl5"
+ 
+ ac_perl_modules="File::Basename "
+ # Make sure we have perl
+@@ -37840,11 +37843,11 @@
+ #    AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore')
+ #fi
+ 
+-if test -f /usr/include/mysql/mysql.h; then
+- CFLAGS="$CFLAGS -I/usr/include/mysql"
+-else
+- CFLAGS="$CFLAGS -Imysql"
+-fi
++#if test -f /usr/include/mysql/mysql.h; then
++# CFLAGS="$CFLAGS -I/usr/include/mysql"
++#else
++# CFLAGS="$CFLAGS -Imysql"
++#fi
+ 
+ CFLAGS="$CFLAGS $OPT_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
+diff -ur gpsdrive-2.10pre4.orig/configure.ac gpsdrive-2.10pre4/configure.ac
+--- gpsdrive-2.10pre4.orig/configure.ac	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/configure.ac	2008-01-06 14:48:50.000000000 +0100
+@@ -662,9 +662,12 @@
+ #  Yep, its ebil, but I does not know better...
+ #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
+ # default on debian should be: /usr/share/perl5/
+-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
+ #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
+-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
++# hard code path for OpenEmbedded environment as I don't know a way
++# to detect it automatically
++PERL_PACKAGE_DIR="/usr/share/perl5"
+ AC_SUBST(PERL_PACKAGE_DIR)
+ 
+ AC_PROG_PERL_MODULES(File::Basename , ,  AC_MSG_ERROR(Need Perl module File::Basename))
+@@ -719,11 +722,11 @@
+ #    AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') 
+ #fi
+ 
+-if test -f /usr/include/mysql/mysql.h; then
+- CFLAGS="$CFLAGS -I/usr/include/mysql"
+-else
+- CFLAGS="$CFLAGS -Imysql"
+-fi
++#if test -f /usr/include/mysql/mysql.h; then
++# CFLAGS="$CFLAGS -I/usr/include/mysql"
++#else
++# CFLAGS="$CFLAGS -Imysql"
++#fi
+ 
+ CFLAGS="$CFLAGS $OPT_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
new file mode 100644
index 0000000000..96e8155861
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=GPSDrive
+Comment=GPS map software
+Exec=gpsdrive -M pda -1
+Icon=gpsicon
+Terminal=false
+Type=Application
+Categories=Graphics;Network;Geography;Application;Other
+StartupNotify=true
diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb
new file mode 100644
index 0000000000..071a5691e3
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive_2.10pre4.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "GPS navigation/map display software"
+SECTION = "x11"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc gtk+ libpcre gpsd libwww-perl-native mysql"
+RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd libwww-perl"
+PR = "r1"
+
+SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
+           file://gpsdrive_2.10pre4.desktop \
+           file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \
+           file://gpsdrive-ifdef-mapnik.patch;patch=1 \
+           file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-garmin"
+
+do_install_append () {
+        mkdir -p  ${D}${datadir}/applications
+        install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop
+	mkdir -p ${D}${datadir}/pixmaps
+	cp ${D}${datadir}/${PN}/pixmaps/gpsicon.png ${D}${datadir}/pixmaps
+        # remove stuff we don't want to package
+        rm ${D}${datadir}/${PN}/gpsdrive.desktop # we have our own one
+        rm -rf ${D}${datadir}/${PN}/DSL # for Damn Small Linux
+        rm -rf ${D}${datadir}/${PN}/gentoo # for Gentoo
+}
+
+PACKAGES += "gpsdrive-maps gpsdrive-map-icons-classic gpsdrive-map-icons-other gpsdrive-addons"
+
+FILES_${PN} = "${bindir}/gpsdrive ${datadir}/applications ${datadir}/map-icons/icons.xml"
+FILES_${PN} += "${datadir}/pixmaps ${datadir}/${PN}/pixmaps ${datadir}/${PN}/poi"
+FILES_${PN}-addons = "${bindir}/*.pl ${bindir}/friendsd2 ${bindir}/geo* ${bindir}/*.sh ${bindir}