From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 4 Feb 2007 20:58:12 +0000 (+0000)
Subject: ixp4xx-kernel: Updated to 2.6.20
X-Git-Tag: Release-2010-05/1~9286^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18338970d6b0f87856fa6c7a6b31c93d00adeb70;p=openembedded.git

ixp4xx-kernel: Updated to 2.6.20
---

diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index 3be13fd971..6841c93d00 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "681"
+IXP4XX_KERNEL_SVN_REV = "682"
 #
 # The directory containing the patches to be applied is
 # specified below
@@ -23,3 +23,16 @@ require ixp4xx-kernel-svnpatch.inc
 
 SRC_URI += "file://defconfig"
 SRC_URI += "file://series"
+
+# Remove the specific cmdline hacking patches if we are not building for nslu2.
+addtask remove_cmdline_hacks before do_patch after do_unpack
+do_remove_cmdline_hacks() {
+
+#	if [ "${MACHINE}" != "nslu2" ] ; then
+		sed	-e '/88-nas100d-dflt-cmdline.patch/d' \
+			-e '/88-nslu2-dflt-cmdline.patch/d' \
+			'${WORKDIR}/series' > '${WORKDIR}/series.new'
+		mv '${WORKDIR}/series.new' '${WORKDIR}/series'
+#	fi
+
+}
diff --git a/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
similarity index 63%
rename from packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb
rename to packages/linux/ixp4xx-kernel_2.6.20.bb
index 5ab6d5c6e7..0cc6b387f7 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "681"
+IXP4XX_KERNEL_SVN_REV = "682"
 #
 # The directory containing the patches to be applied is
 # specified below
@@ -23,3 +23,16 @@ require ixp4xx-kernel-svnpatch.inc
 
 SRC_URI += "file://defconfig"
 SRC_URI += "file://series"
+
+# Remove the specific cmdline hacking patches if we are not building for nslu2.
+addtask remove_cmdline_hacks before do_patch after do_unpack
+do_remove_cmdline_hacks() {
+
+	if [ "${MACHINE}" != "nslu2" ] ; then
+		sed	-e '/88-nas100d-dflt-cmdline.patch/d' \
+			-e '/88-nslu2-dflt-cmdline.patch/d' \
+			'${WORKDIR}/series' > '${WORKDIR}/series.new'
+		mv '${WORKDIR}/series.new' '${WORKDIR}/series'
+	fi
+
+}