diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-01-09 12:32:17 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-01-09 12:32:17 +0000 |
| commit | fca0304f86c05d73e8586701963e36c69acb634e (patch) | |
| tree | 13ee81330e8db80145570429415aedf15409c39e /conf/distro/include/slugos.inc | |
| parent | d33d07ddf3ca35e4ee9a2a50e08d173a2f60de85 (diff) | |
| parent | 76d74e58922ff6196faefb57b0b9264a738e26f5 (diff) | |
merge of '293e51d51d159e1203f6f75bb02b80e8adc041ab'
and '336c3826d3982a8a1f9b8569c023289204dd0092'
Diffstat (limited to 'conf/distro/include/slugos.inc')
| -rw-r--r-- | conf/distro/include/slugos.inc | 4 |
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" |