[oe-commits] org.oe.dev ixp4xx-kernel: Updated to 2.6.20

[rwhitby commit]

ixp4xx-kernel: Updated to 2.6.20

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: eba77e7686dfad7e715b2de7d521c34d5a09e0ac
ViewMTN: http://monotone.openembedded.org/revision.psp?id=eba77e7686dfad7e715b2de7d521c34d5a09e0ac
Files:
1
packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb
packages/linux/ixp4xx-kernel_2.6.20.bb
packages/linux/ixp4xx-kernel_2.6.19.bb
Diffs:

#
# mt diff -ra4f1af86cb19b4b9c06798137fcec61e7eabb7c6 -reba77e7686dfad7e715b2de7d521c34d5a09e0ac
#
# 
# 
# rename "packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb"
#     to "packages/linux/ixp4xx-kernel_2.6.20.bb"
# 
# patch "packages/linux/ixp4xx-kernel_2.6.19.bb"
#  from [a1c6463a94db8abd096ce6de3674227e15470aae]
#    to [b26607155e3e84bb060423feb62e3778765489c7]
# 
# patch "packages/linux/ixp4xx-kernel_2.6.20.bb"
#  from [459ec8cb10642f5d1b5bd7b02fcc6a977e540e7b]
#    to [57d3f98f9cf3aae923078ea1083136178f5ce8f5]
# 
============================================================
--- packages/linux/ixp4xx-kernel_2.6.19.bb	a1c6463a94db8abd096ce6de3674227e15470aae
+++ packages/linux/ixp4xx-kernel_2.6.19.bb	b26607155e3e84bb060423feb62e3778765489c7
@@ -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 @@ SRC_URI += "file://series"
 
 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
+
+}
============================================================
--- packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb	459ec8cb10642f5d1b5bd7b02fcc6a977e540e7b
+++ packages/linux/ixp4xx-kernel_2.6.20.bb	57d3f98f9cf3aae923078ea1083136178f5ce8f5
@@ -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 @@ SRC_URI += "file://series"
 
 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
+
+}