From 127038060f442ed845a61453b67713e3a37d01a2 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sun, 21 Oct 2007 12:06:05 +0000 Subject: angstrom-2007.1.conf: move wpa-supplicant pref version into -preferred-versions.inc instead of setting it there to 0.4.9 and overwriting to 0.5.5 in .conf --- conf/distro/angstrom-2007.1.conf | 3 --- conf/distro/include/angstrom-2007-preferred-versions.inc | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 7af7664023..00fa645c5e 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -151,9 +151,6 @@ PREFERRED_VERSION_busybox = "1.2.1" PREFERRED_VERSION_dbus ?= "1.0.2" PREFERRED_VERSION_dbus-glib ?= "0.74" -PREFERRED_VERSION_wpa-supplicant = "0.5.5" - - #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 22fcca523e..04fa599a70 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -2203,7 +2203,7 @@ PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7" PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7" PREFERRED_VERSION_wmctrl ?= "1.07" PREFERRED_VERSION_wpa-gui ?= "0.4.8" -PREFERRED_VERSION_wpa-supplicant ?= "0.4.9" +PREFERRED_VERSION_wpa-supplicant ?= "0.5.5" PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6" PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6" PREFERRED_VERSION_wrt-imagetools-native ?= "1.0" -- cgit v1.2.3