linux-openmoko_2.6.22.5.bb : merge fixes from OE.dev

diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb
index fc702c8..fe46c59 100644 (file)
--- a/packages/linux/linux-openmoko_2.6.22.5.bb
+++ b/packages/linux/linux-openmoko_2.6.22.5.bb
@@ -60,18 +60,12 @@ module_autoload_snd-mixer-oss = "snd-mixer-oss"
 # sd/mmc
 module_autoload_s3cmci = "s3cmci"
 
-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
+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
 }
+
+addtask prepatch after do_unpack before do_patch
+