merge of 3313872abc2bfcbfb21ee59fce1b8d5dcc921f9e

     and bc4c059f4f2e150e3e6a17f3e80ee88cbd36e52e

2 files changed, 22 insertions, 36 deletions

diff --git a/packages/linux/ixp4xx-kernel-svnpatch.inc b/packages/linux/ixp4xx-kernel-svnpatch.inc
new file mode 100644
index 0000000000..ab122ca67f
--- /dev/null
+++ b/packages/linux/ixp4xx-kernel-svnpatch.inc
@@ -0,0 +1,10 @@
+addtask svnpatch before do_configure after do_patch
+
+do_svnpatch() {
+	svn co http://svn.nslu2-linux.org/svnroot/kernel/branches/ixp_npe/patches/${PV} --revision ${IXP4XX_KERNEL_SVN_REV} ${WORKDIR}/patches-${PV}
+	cp ${WORKDIR}/patches-${PV}/defconfig ${WORKDIR}/defconfig
+	rm -rf ${S}/patches
+    cd ${S} && ln -s ${WORKDIR}/patches-${PV} ${S}/patches
+	cd ${S} && ${STAGING_BINDIR}/quilt push -av
+}
+
diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb
index 7bf2b51a9a..f29df6d448 100644
--- a/packages/linux/ixp4xx-kernel_2.6.18.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.18.bb
@@ -1,43 +1,19 @@
 # Kernel for IXP4xx
 #
-# Increment PR_CONFIG for changes to the ixp4xx-kernel specific
-# defconfig (do *NOT* increment anything in here for changes
-# to other kernel configs!)
-PR_CONFIG = "1"
+# This bitbake file pulls patches and the defconfig straight  
+# from the NSLU2-Linux SVN repository. Information about this 
+# repository can be found at:
+# http://trac.nslu2-linux.org/kernel/
+#
+# The revision that is pulled from SVN is specified below
+IXP4XX_KERNEL_SVN_REV = "411"
 #
 # Increment the number below (i.e. the digits after PR) when
-# making changes within this file or for changes to the patches
-# applied to the kernel.
-PR = "r0.${PR_CONFIG}"
+# the changes in SVN between revisions include changes in the
+# patches applied to the kernel, rather than simply defconfig
+# changes
+PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
 
 require ixp4xx-kernel.inc
+require ixp4xx-kernel-svnpatch.inc
 
-SRC_URI += "http://svn.nslu2-linux.org/svnroot/kernel/branches/ixp_npe/patches/2.6.18/defconfig"
-
-# IXP4XX_PATCHES - full list of patches to apply
-IXP4XX_PATCHES  = ""
-
-SVN_SRC = "http://svn.nslu2-linux.org/svnroot/kernel/branches/ixp_npe/patches/2.6.18"
-
-# IXP4XX_PATCHES += "${SVN_SRC}/00-squashfs3.1.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/02-nas100d-mac-addr.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/04-nslu2-mac-addr.patch;patch=1"
-# IXP4XX_PATCHES += "${SVN_SRC}/05-timer-ixp4xx.patch;patch=1"
-# IXP4XX_PATCHES += "${SVN_SRC}/06-timer-nslu2.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/07-copypage-xscale.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/13-zd1211-arm-fix.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/15-jffs2-endian-config.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/20-nas100d-cmdline-fixup.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/20-nslu2-cmdline-fixup.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/30-ixp4xx-0.1.0-driver.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/31-ixp4xx-0.1.0-fix-compiler-issues.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/32-ixp4xx-0.1.0-fix-MAC-address-setting.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/36-ixp4xx-0.1.0-localfixes.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/37-nslu-setup-mac.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/40-scsi-idle.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/50-leds-arm-cpu-activity.patch;patch=1"
-# IXP4XX_PATCHES += "${SVN_SRC}/75-dsmg600.patch;patch=1"
-# IXP4XX_PATCHES += "${SVN_SRC}/76-dsmg600-pwrbtn.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/77-velocity-module.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/78-velocity-BE.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/79-rtl8110sb-fix.diff;patch=1"