From: nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Date: Sun, 16 Jan 2005 18:40:06 +0000 (+0000)
Subject: Merge bk://oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~15418
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b3ee9d6dd39d32565d133511ad2011f390582c4;p=openembedded.git

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

2005/01/16 17:42:31+00:00 rpsys.net!RP
openzaurus-2.6: split out and reorder patches for upstream submission

BKrev: 41eab5064QEKhLIYZZrF4WnDQsGj2g
---

diff --git a/packages/linux/openzaurus_2.6.11-rc1.bb b/packages/linux/openzaurus_2.6.11-rc1.bb
index e18e4176bd..a1b27d9741 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 = "r5"
+PR = "r6"
 
 # ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
 # http://www.cs.wisc.edu/~lenz/zaurus/
@@ -32,7 +32,9 @@ http://www.rpsys.net/openzaurus/${KV}/jl1/collie_use_sharp_mtd.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/collie_scoop-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/collie_scoop_pcmcia-r0.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_ssp_extra-r0.patch;patch=1 \
-http://www.rpsys.net/openzaurus/${KV}/corgi_base_extras-r5.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_fb-r1.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_mmc-r5.patch;patch=1 \
+http://www.rpsys.net/openzaurus/${KV}/corgi_base_extras-r7.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_backlight-r9.patch;patch=1 \
@@ -40,7 +42,6 @@ http://www.rpsys.net/openzaurus/${KV}/corgi_ts-r3.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/corgi_power-r7.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}/corgi_mmc-r3.patch;patch=1 \
 http://www.rpsys.net/openzaurus/${KV}/mmc_sd-r2.patch;patch=1 \
 file://defconfig-husky \
 file://defconfig-collie \