linux-oz-2.6: Rearrange stable patches to reflect order in mainline. Add extra collie scoop fix. Seperate corgi include fix so mainline c7x0 compiles. Update hx2750 base patch for recent mmc changes.

3 files changed, 22 insertions, 18 deletions

diff --git a/packages/git/files/Makefile.patch b/packages/git/files/Makefile.patch
index 0a82649db9..e360ae917d 100644
--- a/packages/git/files/Makefile.patch
+++ b/packages/git/files/Makefile.patch
@@ -1,13 +1,13 @@
-Index: git-snapshot-20050912/Makefile
+Index: git-snapshot-20051008/Makefile
 ===================================================================
---- git-snapshot-20050912.orig/Makefile	2005-09-11 03:46:53.000000000 +0100
-+++ git-snapshot-20050912/Makefile	2005-09-12 12:18:38.000000000 +0100
-@@ -239,7 +240,7 @@
+--- git-snapshot-20051008.orig/Makefile	2005-10-06 00:57:23.000000000 +0100
++++ git-snapshot-20051008/Makefile	2005-10-08 22:03:50.000000000 +0100
+@@ -332,7 +332,7 @@
  	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
  
- git-%: %.o $(LIB_FILE)
+ git-%$X: %.o $(LIB_FILE)
 -	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
 +	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS)
  
- git-mailinfo : SIMPLE_LIB += $(LIB_4_ICONV)
+ git-mailinfo$X : SIMPLE_LIB += $(LIB_4_ICONV)
  $(SIMPLE_PROGRAMS) : $(LIB_FILE)
diff --git a/packages/linux/linux-openzaurus_2.6.14-rc1.bb b/packages/linux/linux-openzaurus_2.6.14-rc1.bb
index 18eb8bb4a0..f50dba5d0d 100644
--- a/packages/linux/linux-openzaurus_2.6.14-rc1.bb
+++ b/packages/linux/linux-openzaurus_2.6.14-rc1.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r2"
+PR = "r3"
 
 # Handy URLs
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
@@ -19,18 +19,21 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${RPSRC}/sharpsl_bl-r5a.patch;patch=1 \
            ${RPSRC}/spitzkbd-r3.patch;patch=1 \
            ${RPSRC}/spitz_base-r17.patch;patch=1 \
-           ${RPSRC}/pxa_i2c_fixes-r0.patch;patch=1 \
+           ${RPSRC}/corgi_addinclude-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_mtd_extras-r1.patch;patch=1 \
-           ${RPSRC}/pxa_ohci_platform-r1.patch;patch=1 \
-           ${RPSRC}/pxa_ohci_suspend-r0.patch;patch=1 \	 
            ${RPSRC}/corgi_cleanup-r0.patch;patch=1 \
            ${RPSRC}/poodle_cleanup-r0.patch;patch=1 \
            ${RPSRC}/poodle_mmc-r0.patch;patch=1 \
+           ${RPSRC}/scoop_collie_fix-r0.patch;patch=1 \
+           ${RPSRC}/collie_scoop_fix1-r0.patch;patch=1 \
+           ${RPSRC}/scoop_susres-r1.patch;patch=1 \
+           ${RPSRC}/pxa_i2c_fixes-r0.patch;patch=1 \
+           ${RPSRC}/pxa_ohci_platform-r1.patch;patch=1 \
+           ${RPSRC}/pxa_ohci_suspend-r0.patch;patch=1 \	 
            ${RPSRC}/poodle_irda-r0.patch;patch=1 \
            ${RPSRC}/ide_not_removable-r0.patch;patch=1 \
-           ${RPSRC}/scoop_collie_fix-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \
-           ${RPSRC}/corgi_pm-r3.patch;patch=1 \
+           ${RPSRC}/corgi_pm-r4.patch;patch=1 \
            ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \
            ${RPSRC}/spitz_pm-r4.patch;patch=1 \
            ${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \
@@ -40,12 +43,11 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${RPSRC}/pxa_irda-r4.patch;patch=1 \
            ${RPSRC}/corgi_irda-r3.patch;patch=1 \
            ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
-           ${RPSRC}/scoop_susres-r1.patch;patch=1 \
            ${RPSRC}/input_power-r2.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \
            ${RPSRC}/corgi_snd-r10.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \
+           ${RPSRC}/ipaq/hx2750_base-r21.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_bl-r2.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
            ${RPSRC}/ipaq/pxa_keys-r2.patch;patch=1 \
diff --git a/packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb b/packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb
index 136d18a414..c3dc5c8c5a 100644
--- a/packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -33,13 +33,16 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc2.bz2;patch=1 \
            ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \	   
            ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \
+           ${RPSRC}/corgi_addinclude-r0.patch;patch=1 \
+           ${RPSRC}/collie_scoop_fix1-r0.patch;patch=1 \
+           ${RPSRC}/scoop_susres-r1.patch;patch=1 \
            ${RPSRC}/poodle_irda-r0.patch;patch=1 \
            ${RPSRC}/pxa_i2c_fixes-r1.patch;patch=1 \
            ${RPSRC}/pxa_ohci_platform-r1.patch;patch=1 \
            ${RPSRC}/pxa_ohci_suspend-r0.patch;patch=1 \	   
            ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \
            ${RPSRC}/ide_not_removable-r0.patch;patch=1 \
-           ${RPSRC}/corgi_pm-r3.patch;patch=1 \
+           ${RPSRC}/corgi_pm-r4.patch;patch=1 \
            ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \
            ${RPSRC}/spitz_pm-r4.patch;patch=1 \
            ${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \
@@ -49,12 +52,11 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${RPSRC}/pxa_irda-r4.patch;patch=1 \
            ${RPSRC}/corgi_irda-r3.patch;patch=1 \
            ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
-           ${RPSRC}/scoop_susres-r1.patch;patch=1 \
            ${RPSRC}/input_power-r2.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \
            ${RPSRC}/corgi_snd-r10.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \
+           ${RPSRC}/ipaq/hx2750_base-r21.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_bl-r2.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
            ${RPSRC}/ipaq/pxa_keys-r2.patch;patch=1 \