linux-2.6.19+2.6.20-rc4 -> 2.6.20

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1261 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/00-hostap.patch b/meta/packages/linux/linux-rp-2.6.20/00-hostap.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/00-hostap.patch
rename to meta/packages/linux/linux-rp-2.6.20/00-hostap.patch

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/10-pcnet.patch b/meta/packages/linux/linux-rp-2.6.20/10-pcnet.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/10-pcnet.patch
rename to meta/packages/linux/linux-rp-2.6.20/10-pcnet.patch

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/add-oz-release-string.patch b/meta/packages/linux/linux-rp-2.6.20/add-oz-release-string.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/add-oz-release-string.patch
rename to meta/packages/linux/linux-rp-2.6.20/add-oz-release-string.patch

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/connectplus-remove-ide-HACK.patch b/meta/packages/linux/linux-rp-2.6.20/connectplus-remove-ide-HACK.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/connectplus-remove-ide-HACK.patch
rename to meta/packages/linux/linux-rp-2.6.20/connectplus-remove-ide-HACK.patch

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-akita b/meta/packages/linux/linux-rp-2.6.20/defconfig-akita
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-akita
rename to meta/packages/linux/linux-rp-2.6.20/defconfig-akita

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.20/defconfig-c7x0
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-c7x0
rename to meta/packages/linux/linux-rp-2.6.20/defconfig-c7x0

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-collie b/meta/packages/linux/linux-rp-2.6.20/defconfig-collie
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-collie
rename to meta/packages/linux/linux-rp-2.6.20/defconfig-collie

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.20/defconfig-hx2000
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-hx2000
rename to meta/packages/linux/linux-rp-2.6.20/defconfig-hx2000

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-ipaq-pxa270 b/meta/packages/linux/linux-rp-2.6.20/defconfig-ipaq-pxa270
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-ipaq-pxa270
rename to meta/packages/linux/linux-rp-2.6.20/defconfig-ipaq-pxa270

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.20/defconfig-poodle
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-poodle
rename to meta/packages/linux/linux-rp-2.6.20/defconfig-poodle

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.20/defconfig-qemuarm
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemuarm
rename to meta/packages/linux/linux-rp-2.6.20/defconfig-qemuarm

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.20/defconfig-qemux86
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemux86
rename to meta/packages/linux/linux-rp-2.6.20/defconfig-qemux86

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.20/defconfig-spitz
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-spitz
rename to meta/packages/linux/linux-rp-2.6.20/defconfig-spitz

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-tosa b/meta/packages/linux/linux-rp-2.6.20/defconfig-tosa
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-tosa
rename to meta/packages/linux/linux-rp-2.6.20/defconfig-tosa

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/hrw-pcmcia-ids-r5.patch b/meta/packages/linux/linux-rp-2.6.20/hrw-pcmcia-ids-r5.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/hrw-pcmcia-ids-r5.patch
rename to meta/packages/linux/linux-rp-2.6.20/hrw-pcmcia-ids-r5.patch

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/orinoco-remove-all-which-are-in-hostap-HACK.patch b/meta/packages/linux/linux-rp-2.6.20/orinoco-remove-all-which-are-in-hostap-HACK.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/orinoco-remove-all-which-are-in-hostap-HACK.patch
rename to meta/packages/linux/linux-rp-2.6.20/orinoco-remove-all-which-are-in-hostap-HACK.patch

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/pxa-serial-hack.patch b/meta/packages/linux/linux-rp-2.6.20/pxa-serial-hack.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/pxa-serial-hack.patch
rename to meta/packages/linux/linux-rp-2.6.20/pxa-serial-hack.patch

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/meta/packages/linux/linux-rp-2.6.20/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
rename to meta/packages/linux/linux-rp-2.6.20/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/squashfs3.0-2.6.15.patch b/meta/packages/linux/linux-rp-2.6.20/squashfs3.0-2.6.15.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/squashfs3.0-2.6.15.patch
rename to meta/packages/linux/linux-rp-2.6.20/squashfs3.0-2.6.15.patch

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/vesafb-tng-1.0-rc2-2.6.20-rc2.patch b/meta/packages/linux/linux-rp-2.6.20/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
rename to meta/packages/linux/linux-rp-2.6.20/vesafb-tng-1.0-rc2-2.6.20-rc2.patch

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/wm97xx-lcdnoise-r0.patch b/meta/packages/linux/linux-rp-2.6.20/wm97xx-lcdnoise-r0.patch
similarity index 100%
rename from meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/wm97xx-lcdnoise-r0.patch
rename to meta/packages/linux/linux-rp-2.6.20/wm97xx-lcdnoise-r0.patch

diff --git a/meta/packages/linux/linux-rp_2.6.19+2.6.20-rc4.bb b/meta/packages/linux/linux-rp_2.6.20.bb
similarity index 95%
rename from meta/packages/linux/linux-rp_2.6.19+2.6.20-rc4.bb
rename to meta/packages/linux/linux-rp_2.6.20.bb
index d15141fa53e2916e663686ea269e21ce4706df88..f0f62c36b29921db9e600567884379f5e16210cf 100644 (file)
--- a/meta/packages/linux/linux-rp_2.6.19+2.6.20-rc4.bb
+++ b/meta/packages/linux/linux-rp_2.6.20.bb
@@ -5,6 +5,7 @@ PR = "r1"
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
 # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
+# http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.20-rc4.tar.bz2
 # http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;patch=1
 # http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;patch=1
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
@@ -12,9 +13,8 @@ PR = "r1"
 
 # 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/testing/linux-2.6.20-rc4.tar.bz2 \
-           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13pre1.patch;patch=1;status=merged \
-           ${RPSRC}/asoc_13pre1_fix-r0.patch;patch=1 \
+SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13.patch;patch=1;status=merged \
            ${RPSRC}/hx2750_base-r28.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r8.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
@@ -100,4 +100,4 @@ SRC_URI_append_tosa = "\
            file://wm97xx-lcdnoise-r0.patch;patch=1 "
 #          ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
 
-S = "${WORKDIR}/linux-2.6.20-rc4"
+S = "${WORKDIR}/linux-2.6.20"