diff options
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.20/defconfig | 2 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.20/series | 4 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.20.bb | 2 | ||||
| -rw-r--r-- | packages/tasks/task-slugos.bb | 10 |
4 files changed, 13 insertions, 5 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.20/defconfig b/packages/linux/ixp4xx-kernel/2.6.20/defconfig index d9a1bbc22f..6322bd14a0 100644 --- a/packages/linux/ixp4xx-kernel/2.6.20/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.20/defconfig @@ -965,7 +965,7 @@ CONFIG_PPPOE=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 diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series index 7100d2f806..ddbc2da1a3 100644 --- a/packages/linux/ixp4xx-kernel/2.6.20/series +++ b/packages/linux/ixp4xx-kernel/2.6.20/series @@ -9,7 +9,8 @@ squashfs/squashfs-force-O2.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 @@ squashfs/squashfs-Makefile.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 diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb index 0cd0a59969..193e82f518 100644 --- a/packages/linux/ixp4xx-kernel_2.6.20.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 = "699" +IXP4XX_KERNEL_SVN_REV = "704" # # The directory containing the patches to be applied is # specified below diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 04ac07de0d..3707316c1e 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ 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 @@ SLUGOS_STANDARD_RDEPENDS += "\ 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 \ |