[oe-commits] org.oe.dev 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.

[likewise commit]

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.

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: c22898d69793df7ecf7b5bb1e62791c4780023ab
ViewMTN: http://monotone.openembedded.org/revision/info/c22898d69793df7ecf7b5bb1e62791c4780023ab
Files:
1
packages/linux/linux-ixp4xx/defconfig-2.6.23.8
packages/linux/linux-ixp4xx/defconfig-2.6.23.12
packages/linux/linux-ixp4xx_2.6.23.8.bb
packages/linux/linux-ixp4xx_2.6.23.12.bb
conf/distro/include/sane-srcrevs.inc
packages/linux/linux-ixp4xx.inc
Diffs:

#
# mt diff -r718d6389d03e6899ca6c6b7ff65639c21e6544bf -rc22898d69793df7ecf7b5bb1e62791c4780023ab
#
# 
# 
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.23.8"
#     to "packages/linux/linux-ixp4xx/defconfig-2.6.23.12"
# 
# rename "packages/linux/linux-ixp4xx_2.6.23.8.bb"
#     to "packages/linux/linux-ixp4xx_2.6.23.12.bb"
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [11acb028456fb05345111447a0655b656a67d690]
#    to [6d7b2bbfb57a80d4d3d27fe559300eeca5f0af22]
# 
# patch "packages/linux/linux-ixp4xx.inc"
#  from [104c898701b243728e14a24a5ac89d50ede467ad]
#    to [22f02122239bf39a17155973a510c77a0e4d9de9]
# 
# patch "packages/linux/linux-ixp4xx_2.6.23.12.bb"
#  from [5072d1cda9fcc89b0db1894b9225812ec971acc9]
#    to [91f144590f8e37b3d4894d7feebebb9a022be434]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	11acb028456fb05345111447a0655b656a67d690
+++ conf/distro/include/sane-srcrevs.inc	6d7b2bbfb57a80d4d3d27fe559300eeca5f0af22
@@ -42,7 +42,7 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 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"
============================================================
--- packages/linux/linux-ixp4xx.inc	104c898701b243728e14a24a5ac89d50ede467ad
+++ packages/linux/linux-ixp4xx.inc	22f02122239bf39a17155973a510c77a0e4d9de9
@@ -1,9 +1,9 @@ COMPATIBLE_HOST = 'arm.*-linux.*'
 # linux-ixp4xx.inc
 #
 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.
 
============================================================
--- packages/linux/linux-ixp4xx_2.6.23.8.bb	5072d1cda9fcc89b0db1894b9225812ec971acc9
+++ packages/linux/linux-ixp4xx_2.6.23.12.bb	91f144590f8e37b3d4894d7feebebb9a022be434
@@ -6,13 +6,13 @@ VANILLA_VERSION = "2.6.23"
 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 @@ S = "${WORKDIR}/linux-${VANILLA_VERSION}
 
 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 postpatch after do_patch before do_configure
-addtask prepatch after do_unpack before do_patch