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/linux')

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 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/linux')

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