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(-)

(limited to 'packages')

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

(limited to 'packages')

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(+)

(limited to 'packages')

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(-)

(limited to 'packages')

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(-)

(limited to 'packages')

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

---
 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 ----------------------
 6 files changed, 54 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

(limited to 'packages')

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(-)

(limited to 'packages')

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.

---
 packages/linux/linux-openmoko_2.6.22.5.bb | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'packages')

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 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(-)

(limited to 'packages')

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(-)

(limited to 'packages')

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(-)

(limited to 'packages')

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 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(+)

(limited to 'packages')

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

(limited to 'packages')

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