summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-07-09 12:31:19 +0000
committerRichard Purdie <richard@openedhand.com>2007-07-09 12:31:19 +0000
commitea9a2560dffc03b8dbea5c0fd27651970a14eaef (patch)
treeddc34b454ab69bc61ea12df3dbc8b662c68f4d8d
parent8b1fff0aa4c02e0e7c267aa9669e1dc8675ba90a (diff)
downloadpoky-ea9a2560dffc03b8dbea5c0fd27651970a14eaef.tar.gz
linux-rp: 2.6.21+2.6.22-rc7 -> 2.6.22
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2130 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/connectplus-remove-ide-HACK.patch (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/connectplus-remove-ide-HACK.patch)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/defconfig-akita (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-akita)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/defconfig-bootcdx86 (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-bootcdx86)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/defconfig-c7x0 (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-c7x0)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/defconfig-collie (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-collie)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/defconfig-hx2000 (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-hx2000)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/defconfig-poodle (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-poodle)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/defconfig-qemuarm (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemuarm)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/defconfig-qemux86 (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemux86)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/defconfig-spitz (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-spitz)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/defconfig-tosa (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-tosa)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/hostap-monitor-mode.patch (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/hostap-monitor-mode.patch)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/pxa-serial-hack.patch (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/pxa-serial-hack.patch)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/squashfs3.0-2.6.15.patch (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/squashfs3.0-2.6.15.patch)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/vesafb-tng-1.0-rc2-2.6.20-rc2.patch (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/vesafb-tng-1.0-rc2-2.6.20-rc2.patch)0
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/wm97xx-lcdnoise-r0.patch (renamed from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/wm97xx-lcdnoise-r0.patch)0
-rw-r--r--meta/packages/linux/linux-rp_2.6.22.bb (renamed from meta/packages/linux/linux-rp_2.6.21+2.6.22-rc7.bb)8
18 files changed, 3 insertions, 5 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/connectplus-remove-ide-HACK.patch b/meta/packages/linux/linux-rp-2.6.22/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/connectplus-remove-ide-HACK.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/connectplus-remove-ide-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-akita b/meta/packages/linux/linux-rp-2.6.22/defconfig-akita
index 748ab41d22..748ab41d22 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-akita
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-akita
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-bootcdx86 b/meta/packages/linux/linux-rp-2.6.22/defconfig-bootcdx86
index d439d89813..d439d89813 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-bootcdx86
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-bootcdx86
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.22/defconfig-c7x0
index e8efdd4de2..e8efdd4de2 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-c7x0
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-c7x0
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-collie b/meta/packages/linux/linux-rp-2.6.22/defconfig-collie
index 422ed94df3..422ed94df3 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-collie
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-collie
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.22/defconfig-hx2000
index 2a67a2d045..2a67a2d045 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-hx2000
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-hx2000
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.22/defconfig-poodle
index 13616c08f1..13616c08f1 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-poodle
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-poodle
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.22/defconfig-qemuarm
index f70b6db7c7..f70b6db7c7 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemuarm
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-qemuarm
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.22/defconfig-qemux86
index 08e0a0c6c7..08e0a0c6c7 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemux86
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-qemux86
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.22/defconfig-spitz
index 11cad5c911..11cad5c911 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-spitz
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-spitz
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-tosa b/meta/packages/linux/linux-rp-2.6.22/defconfig-tosa
index 4360f7a179..4360f7a179 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-tosa
+++ b/meta/packages/linux/linux-rp-2.6.22/defconfig-tosa
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/hostap-monitor-mode.patch b/meta/packages/linux/linux-rp-2.6.22/hostap-monitor-mode.patch
index 641fd19e50..641fd19e50 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/hostap-monitor-mode.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/hostap-monitor-mode.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/pxa-serial-hack.patch b/meta/packages/linux/linux-rp-2.6.22/pxa-serial-hack.patch
index bf20f46a05..bf20f46a05 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/pxa-serial-hack.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/pxa-serial-hack.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/meta/packages/linux/linux-rp-2.6.22/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index b513ba1466..b513ba1466 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/squashfs3.0-2.6.15.patch b/meta/packages/linux/linux-rp-2.6.22/squashfs3.0-2.6.15.patch
index 6312efe46a..6312efe46a 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/squashfs3.0-2.6.15.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/squashfs3.0-2.6.15.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/vesafb-tng-1.0-rc2-2.6.20-rc2.patch b/meta/packages/linux/linux-rp-2.6.22/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
index b1b0fc3549..b1b0fc3549 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
diff --git a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/wm97xx-lcdnoise-r0.patch b/meta/packages/linux/linux-rp-2.6.22/wm97xx-lcdnoise-r0.patch
index 191de3af22..191de3af22 100644
--- a/meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/wm97xx-lcdnoise-r0.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/wm97xx-lcdnoise-r0.patch
diff --git a/meta/packages/linux/linux-rp_2.6.21+2.6.22-rc7.bb b/meta/packages/linux/linux-rp_2.6.22.bb
index 12881c869c..5f8701a64b 100644
--- a/meta/packages/linux/linux-rp_2.6.21+2.6.22-rc7.bb
+++ b/meta/packages/linux/linux-rp_2.6.22.bb
@@ -1,6 +1,6 @@
1require linux-rp.inc 1require linux-rp.inc
2 2
3PR = "r2" 3PR = "r0"
4 4
5DEFAULT_PREFERENCE = "-1" 5DEFAULT_PREFERENCE = "-1"
6 6
@@ -15,8 +15,7 @@ DEFAULT_PREFERENCE = "-1"
15 15
16# Patches submitted upstream are towards top of this list 16# Patches submitted upstream are towards top of this list
17# Hacks should clearly named and at the bottom 17# Hacks should clearly named and at the bottom
18SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \ 18SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
19 http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.22-rc7.bz2;patch=1 \
20 ${RPSRC}/lzo_kernel-r3.patch;patch=1 \ 19 ${RPSRC}/lzo_kernel-r3.patch;patch=1 \
21 ${RPSRC}/lzo_jffs2-r2.patch;patch=1 \ 20 ${RPSRC}/lzo_jffs2-r2.patch;patch=1 \
22 ${RPSRC}/lzo_crypto-r2.patch;patch=1 \ 21 ${RPSRC}/lzo_crypto-r2.patch;patch=1 \
@@ -40,7 +39,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
40 ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \ 39 ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
41 ${RPSRC}/w100_extaccel-r1.patch;patch=1 \ 40 ${RPSRC}/w100_extaccel-r1.patch;patch=1 \
42 ${RPSRC}/qemuarm_scsi_fix-r0.patch;patch=1 \ 41 ${RPSRC}/qemuarm_scsi_fix-r0.patch;patch=1 \
43 ${RPSRC}/pxa_cken_fixes-r0.patch;patch=1 \
44 file://hostap-monitor-mode.patch;patch=1 \ 42 file://hostap-monitor-mode.patch;patch=1 \
45 file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ 43 file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
46 ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ 44 ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
@@ -110,4 +108,4 @@ SRC_URI_append_tosa = "\
110 file://wm97xx-lcdnoise-r0.patch;patch=1 " 108 file://wm97xx-lcdnoise-r0.patch;patch=1 "
111# ${DOSRC}/tosa-asoc-r1.patch;patch=1 " 109# ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
112 110
113S = "${WORKDIR}/linux-2.6.21" 111S = "${WORKDIR}/linux-2.6.22"