summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>2006-04-29 15:31:04 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-29 15:31:04 +0000
commit767fbaf85afcc771ff75ae4a3700b15b6618348b (patch)
tree2b2638469bdf245f8e89928fe0a2bbd19ca10919 /conf
parent9c41aa0ac6571d2d9a16f5c2ddcb32e3a92c8642 (diff)
parent483802f0d60dde347bc5b916d3d326329e810678 (diff)
merge of 7df389f1eac3887a08aa90c06c5abb20cd46ee79
and d73fbf99ff9ab2f08a1a7727c83b74f21bbd896d
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/slugos.conf5
1 files changed, 4 insertions, 1 deletions
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 5a73aff7a2..acb055eb42 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -78,7 +78,7 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}"
# pull in the frozen list of bbfiles - this sets BBFILES and this will override any
# setting in local.conf Since this depends on ${DISTRO} it doesn't actually do
# anything by default unless conf/distro/${DISTRO}-packages.conf exists.
-include conf/distro/freeze.conf
+# include conf/distro/freeze.conf
#----------------------------------------------------------------------------------
# FEEDS
@@ -182,6 +182,9 @@ PREFERRED_VERSION_ixp400-eth ?= "1.5"
PREFERRED_PROVIDER_libx11 ?= "diet-x11"
SRCDATE_diet-x11 ?= "20060106"
+# Latest wpa-supplicant which supports madwifi-ng
+PREFERRED_VERSION_wpa-supplicant ?= "0.5.1"
+
# Ensure consistency across all SlugOS builds for the provider of a
# relational database - use the latest version of the SleepyCat
# Berkeley database