summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/slugos.conf5
-rw-r--r--packages/meta/slugos-packages.bb2
2 files changed, 5 insertions, 2 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
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 504894fd86..0baa850aa5 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -93,7 +93,7 @@ SLUGOS_PACKAGES = "\
lsof \
lvm2 \
m4 \
- madwifi-ng-modules \
+ madwifi-ng \
mailx \
make \
masqmail \