aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-02-04 21:00:19 +0000
committerRod Whitby <rod@whitby.id.au>2007-02-04 21:00:19 +0000
commit3c687d1dbfd455c79126341112c381cd24f86bdb (patch)
tree614e4a2301afbfc4d435f705784d51a085243c25 /conf
parentf4f7c1252963e6de79fc138c635792f418593557 (diff)
parent978505ae9bbcae23dee135c1cc90d163c3e3abe6 (diff)
downloadopenembedded-3c687d1dbfd455c79126341112c381cd24f86bdb.tar.gz
merge of '9854932ee8e3c0cfaf427abbdf5b804b7f7f9d91'
and 'd7d5cb097f959159a7ba2d55828e3be38f7830dd'
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/slugos.inc8
1 files changed, 1 insertions, 7 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 2e004d26bd..ba61355ba8 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -169,18 +169,12 @@ 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.20"
# Select the smallest provider of x11 libraries
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
SRCDATE_diet-x11 ?= "20060106"
-# Latest wpa-supplicant which supports madwifi-ng
-PREFERRED_VERSION_wpa-supplicant ?= "0.5.1"
-
-# Latest linphone supports yeaphone
-PREFERRED_VERSION_linphone ?= "1.6.0"
-
# Ensure consistency across all SlugOS builds for the provider of a
# relational database - use the latest version of the SleepyCat
# Berkeley database