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

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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/connectplus-remove-ide-HACK.patch
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-akita
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-bootcdx86
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-c7x0
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-collie
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-hx2000
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-poodle
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemuarm
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-qemux86
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-spitz
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/defconfig-tosa
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/hostap-monitor-mode.patch
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/pxa-serial-hack.patch
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/squashfs3.0-2.6.15.patch
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
rename to 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
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.21+2.6.22-rc7/wm97xx-lcdnoise-r0.patch
rename to 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
similarity index 96%
rename from meta/packages/linux/linux-rp_2.6.21+2.6.22-rc7.bb
rename to meta/packages/linux/linux-rp_2.6.22.bb
index 12881c869ccbfb0aeb3a00ed64a70241c386140a..5f8701a64b666de585d4b6b68bff20d3fa7b8d55 100644 (file)
--- 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 @@
 require linux-rp.inc
 
-PR = "r2"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -15,8 +15,7 @@ DEFAULT_PREFERENCE = "-1"
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
-SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.22-rc7.bz2;patch=1 \
+SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
            ${RPSRC}/lzo_kernel-r3.patch;patch=1 \
            ${RPSRC}/lzo_jffs2-r2.patch;patch=1 \
            ${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 \
            ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r1.patch;patch=1 \
            ${RPSRC}/qemuarm_scsi_fix-r0.patch;patch=1 \
-           ${RPSRC}/pxa_cken_fixes-r0.patch;patch=1 \
            file://hostap-monitor-mode.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
@@ -110,4 +108,4 @@ SRC_URI_append_tosa = "\
            file://wm97xx-lcdnoise-r0.patch;patch=1 "
 #          ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
 
-S = "${WORKDIR}/linux-2.6.21"
+S = "${WORKDIR}/linux-2.6.22"