linux-ixp4xx-2.6.23.x: Move from .8 to .12, nslu2-linux rev 927 to 957. postpatch() instead of prepatch() nslu2-linux kernel patches.

4 files changed, 22 insertions, 8 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 5446a425ce..af96ae435a 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -42,7 +42,7 @@ SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "927"
+SRCREV_pn-linux-ixp4xx ?= "957"
 SRCREV_pn-linux-openmoko ?= "3238"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
diff --git a/packages/linux/linux-ixp4xx.inc b/packages/linux/linux-ixp4xx.inc
index 02f80b06a1..9c4dd375a0 100644
--- a/packages/linux/linux-ixp4xx.inc
+++ b/packages/linux/linux-ixp4xx.inc
@@ -3,7 +3,7 @@
 DESCRIPTION = "Linux 2.6.x kernel for IXP4xx devices"
 
 COMPATIBLE_HOST = 'arm.*-linux.*'
-COMPATIBLE_MACHINE = '(ixp4xx|nslu2)'
+COMPATIBLE_MACHINE = '(ixp4xx|nslu2|syhl1)'
 
 # To specify the console set KERNEL_CONSOLE in the .bb file.
 
diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.23.8 b/packages/linux/linux-ixp4xx/defconfig-2.6.23.12
index efbd55195d..efbd55195d 100644
--- a/packages/linux/linux-ixp4xx/defconfig-2.6.23.8
+++ b/packages/linux/linux-ixp4xx/defconfig-2.6.23.12
diff --git a/packages/linux/linux-ixp4xx_2.6.23.8.bb b/packages/linux/linux-ixp4xx_2.6.23.12.bb
index ab621f310a..14b79ae7cb 100644
--- a/packages/linux/linux-ixp4xx_2.6.23.8.bb
+++ b/packages/linux/linux-ixp4xx_2.6.23.12.bb
@@ -6,13 +6,13 @@ require linux.inc
 require linux-ixp4xx.inc
 
 VANILLA_VERSION = "2.6.23"
-KERNEL_RELEASE = "2.6.23.8"
+KERNEL_RELEASE = "2.6.23.12"
 
 # If you use a rc, you will need to use this:
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
@@ -21,11 +21,25 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.ta
 
 S = "${WORKDIR}/linux-${VANILLA_VERSION}"
 
-do_prepatch() {
+# Apply the patches from the nslu2-linux project (after the patches in SRC_URI)
+do_postpatch() {
+	# Move away OE patches which have been already applied.
+	mv ${S}/patches ${S}/patches.oe
+	mv .pc .pc.oe
+
+	# Move the NSLU2 patches in place for quilt and apply them.
         mv ${WORKDIR}/${VANILLA_VERSION} ${S}/patches && cd ${S} && quilt push -av
-        mv patches patches.ixp4xx
-        mv .pc .pc.old
+
+	# Store the NSLU2 patches 
+        mv ${S}/patches ${S}/patches.ixp4xx
+        mv .pc .pc.ixp4xx
+
+ 	# And move back the OE patches
+	mv ${S}/patches.oe ${S}/patches
+	mv .pc.oe .pc
+
+	# Copy the defconfig into ${WORKDIR}
         mv ${WORKDIR}/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig
 }
 
-addtask prepatch after do_unpack before do_patch
+addtask postpatch after do_patch before do_configure