From: nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Date: Fri, 21 Jan 2005 00:40:11 +0000 (+0000)
Subject: Merge bk://oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~15378
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8f88822e375f2228652ea332257574b7c7784f5;p=openembedded.git

Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/21 00:34:50+00:00 rpsys.net!RP
openzaurus-2.6: fix patches ready for upstream

BKrev: 41f04f6bqGQ0lUyABC-U9R2nlFFVwA
---

diff --git a/packages/linux/openzaurus_2.6.11-rc1.bb b/packages/linux/openzaurus_2.6.11-rc1.bb
index ed80d699e8..fa4014e234 100644
--- a/packages/linux/openzaurus_2.6.11-rc1.bb
+++ b/packages/linux/openzaurus_2.6.11-rc1.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey
 LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r9"
+PR = "r10"
 
 # ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
 # http://www.cs.wisc.edu/~lenz/zaurus/
@@ -14,6 +14,7 @@ PR = "r9"
 #http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_base.patch;patch=1 \
 #http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_fb.patch;patch=1 \
 #http://www.rpsys.net/openzaurus/${KV}/jl1/pxa-cpu.patch;patch=1 \
+#http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_kbd.patch;patch=1 \
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
 http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.11-rc1-bk7.gz;patch=1 \
@@ -22,7 +23,6 @@ http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.11-rc1-bk7.gz;pa
 http://www.rpsys.net/openzaurus/${KV}/jl1/pxa-linking-bug.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_pm.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_devices.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_kbd.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_lcd.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/jl1/collie_uart.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/jl1/collie_batswitch.patch;patch=1 \
@@ -38,9 +38,9 @@ http://www.rpsys.net/openzaurus/${KV}/corgi_base_extras2-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_base_extras3-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_base_extras1-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/jffs2_longfilename-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_kbd-r8.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_kbd-r10.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_ts-r5.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_power-r11.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_power-r12.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_power1-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/ide_fixes-r1.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/mmc_sd-r3.patch;patch=1 \