summaryrefslogtreecommitdiff
path: root/conf/distro/include
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-01-09 08:41:36 +0000
committerRod Whitby <rod@whitby.id.au>2007-01-09 08:41:36 +0000
commite53297287a5bb9e25f42b50703e81257c25d018f (patch)
tree6a54021d06994525d33761fcd4f3fe77b6bb6811 /conf/distro/include
parent70e1bf1a453e4d7968b4a4481cf7e203aa793f95 (diff)
ixp4xx-kernel: Updated to 2.6.20-rc4, and made default for SlugOS. Includes latest 0.3.1 version of open source ixp npe driver.
Diffstat (limited to 'conf/distro/include')
-rw-r--r--conf/distro/include/slugos.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index b255e85488..7ca663a4d6 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -36,7 +36,7 @@
#DISTRO_TYPE
# The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.1"
+SLUGOS_VERSION = "4.2"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):
@@ -171,7 +171,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
# Select the correct versions of the kernel and modules (these are the
# defaults, override in the conf/distro top-level distro file).
PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19+2.6.20-rc4"
# Select the smallest provider of x11 libraries
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"