diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-08-06 11:04:38 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-08-06 11:04:38 +0000 |
| commit | f981d5e7a407b1218f6c189fe803703cb8857483 (patch) | |
| tree | a5aa3b36171161a3086f93a74b44343dd708e2a9 | |
| parent | 6f7f237a4067891355df5f8379bd3cca39076c61 (diff) | |
| parent | 2726e2e97adfbc8117559309e88dfa49baf847b2 (diff) | |
merge of '0f0d473a082d7b3643a49221ef58800654470d80'
and '8416ad85221db47c91cfb9a3991e6f564dc834f9'
| -rw-r--r-- | conf/distro/include/slugos.inc | 2 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.21/defconfig | 2 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.21.6.bb | 2 | ||||
| -rw-r--r-- | packages/tasks/task-slugos.bb | 5 |
4 files changed, 7 insertions, 4 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index bb1605e41b..00b9440b1f 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.4" +SLUGOS_VERSION = "4.5" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig index 56474d512a..0fbb58a561 100644 --- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig @@ -885,7 +885,7 @@ CONFIG_TUN=m CONFIG_NET_ETHERNET=y CONFIG_MII=m CONFIG_IXP4XX_QMGR=m -CONFIG_IXP4XX_NPE=m +CONFIG_IXP4XX_NPE=y CONFIG_IXP4XX_NPE_FW_LOAD=y CONFIG_IXP4XX_NPE_FW_MTD=y CONFIG_IXP4XX_MAC=m diff --git a/packages/linux/ixp4xx-kernel_2.6.21.6.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb index ff90bcb3b3..b0ba8ba787 100644 --- a/packages/linux/ixp4xx-kernel_2.6.21.6.bb +++ b/packages/linux/ixp4xx-kernel_2.6.21.6.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 = "914" +IXP4XX_KERNEL_SVN_REV = "915" # # 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 d2281bca17..21f1b551f5 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 = "r12" +PR = "r13" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -92,6 +92,9 @@ kernel-module-pata-artop \ # Add modules required for Network support SLUGOS_STANDARD_RRECOMMENDS += "\ +kernel-module-mii \ +kernel-module-ixp4xx-mac \ +kernel-module-ixp4xx-qmgr \ kernel-module-via-velocity \ " |