[oe-commits] org.oe.dev slugos: demoted netconsole driver to module in rootfs, removed dsmg600 cmdline

[mwester commit]

slugos: demoted netconsole driver to module in rootfs, removed dsmg600 cmdline
patch (replaced by shim), added linux-2.6.20.1 patch, to bring in sync with svn

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: db725bcc14971edf3f7b52d7083ab60cbda61a40
ViewMTN: http://monotone.openembedded.org/revision.psp?id=db725bcc14971edf3f7b52d7083ab60cbda61a40
Files:
1
packages/linux/ixp4xx-kernel/2.6.20/defconfig
packages/linux/ixp4xx-kernel/2.6.20/series
packages/linux/ixp4xx-kernel_2.6.20.bb
packages/tasks/task-slugos.bb
Diffs:

#
# mt diff -r5eb7eea3659bf046a326cc8a7d9311e2d59e4431 -rdb725bcc14971edf3f7b52d7083ab60cbda61a40
#
# 
# 
# patch "packages/linux/ixp4xx-kernel/2.6.20/defconfig"
#  from [d7c4d5909555976d9051b2591928c469114ba75c]
#    to [fb93da2eb2160d41c95426cc819b0c5bbb83793d]
# 
# patch "packages/linux/ixp4xx-kernel/2.6.20/series"
#  from [ab1a8e4cafbe6b604c1c90a44935570b236c9257]
#    to [b7a7a061ede29e919e9d64194be305e8bae5ae6d]
# 
# patch "packages/linux/ixp4xx-kernel_2.6.20.bb"
#  from [b44db8b8f322c513645cc7a0a0e82b5ff356ca9b]
#    to [483a69e1d5b40bd48e6615c58f349c471c41af0a]
# 
# patch "packages/tasks/task-slugos.bb"
#  from [3da03809312c8fa323e565a59081d887eff9801d]
#    to [808350989f8b2f51d6e58b3b6d85bea3980151fc]
# 
============================================================
--- packages/linux/ixp4xx-kernel/2.6.20/defconfig	d7c4d5909555976d9051b2591928c469114ba75c
+++ packages/linux/ixp4xx-kernel/2.6.20/defconfig	fb93da2eb2160d41c95426cc819b0c5bbb83793d
@@ -965,7 +965,7 @@ CONFIG_SLHC=m
 CONFIG_SLHC=m
 # CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
-CONFIG_NETCONSOLE=y
+CONFIG_NETCONSOLE=m
 CONFIG_NETPOLL=y
 # CONFIG_NETPOLL_RX is not set
 # CONFIG_NETPOLL_TRAP is not set
============================================================
--- packages/linux/ixp4xx-kernel/2.6.20/series	ab1a8e4cafbe6b604c1c90a44935570b236c9257
+++ packages/linux/ixp4xx-kernel/2.6.20/series	b7a7a061ede29e919e9d64194be305e8bae5ae6d
@@ -9,7 +9,8 @@ squashfs/squashfs-Makefile.patch
 squashfs/squashfs-lzma.patch
 squashfs/squashfs-Kconfig.patch
 squashfs/squashfs-Makefile.patch
-00-fix-redboot-bad-code.patch
+00-linux-2.6.20.1.patch
+01-fix-redboot-bad-code.patch
 07-remove-avila-ixdp425-setup.patch
 08-avila-loft-setup.patch
 09-avila-setup-pata.patch
@@ -35,7 +36,6 @@ 87-dsmg600-rtc-fixup.patch
 85-nslu2-rtc-fixup.patch
 86-nas100d-rtc-fixup.patch
 87-dsmg600-rtc-fixup.patch
-88-dsmg600-dflt-cmdline.patch
 96-fsg3-support.patch
 98-sata_via-pata-support-upstream.patch
 99-avila-mtd-microcode.patch
============================================================
--- packages/linux/ixp4xx-kernel_2.6.20.bb	b44db8b8f322c513645cc7a0a0e82b5ff356ca9b
+++ packages/linux/ixp4xx-kernel_2.6.20.bb	483a69e1d5b40bd48e6615c58f349c471c41af0a
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "699"
+IXP4XX_KERNEL_SVN_REV = "704"
 #
 # The directory containing the patches to be applied is
 # specified below
============================================================
--- packages/tasks/task-slugos.bb	3da03809312c8fa323e565a59081d887eff9801d
+++ packages/tasks/task-slugos.bb	808350989f8b2f51d6e58b3b6d85bea3980151fc
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 
@@ -89,6 +89,14 @@ kernel-module-via-velocity \
 kernel-module-via-velocity \
 "
 
+# Add modules required for Network Console support
+# NOTE: This module is desirable for systems lacking a physical
+# console, but is usually only enabled if specific needs or issues
+# arise.  If space in the flash is at a premium, it can be omitted.
+SLUGOS_STANDARD_RDEPENDS += "\
+kernel-module-netconsole \
+"
+
 DEPENDS += "${DISTRO_EXTRA_DEPENDS}"
 
 RDEPENDS += "kernel ixp4xx-npe \