merge of 1ba45cf53c0878304cb1ded93545b1938b45606f

     and 5478d2000cb4fb6a9810fc0fd5cb8d1fc2903536

5 files changed, 5 insertions, 6 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 71dc101f0f..36d4c331b9 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -298,7 +298,7 @@ export palmqtdir = "/opt/QtPalmtop"
 GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
 SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge"
-GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source"
+GPE_MIRROR = "http://handhelds.org/pub/projects/gpe/source"
 XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
 XORG_MIRROR = "http://xorg.freedesktop.org/releases"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf
index fbecc6e25c..57afe89ce7 100644
--- a/conf/machine/include/handheld-common.conf
+++ b/conf/machine/include/handheld-common.conf
@@ -20,6 +20,6 @@ PCMCIA_MANAGER ?= "pcmcia-cs"
 
 # Configuration bits for "generic handheld"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
 INHERIT += "linux_modules"
diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf
index 184258c8b6..c8be696358 100644
--- a/conf/machine/include/zaurus-clamshell-2.4.conf
+++ b/conf/machine/include/zaurus-clamshell-2.4.conf
@@ -11,7 +11,7 @@ PREFERRED_VERSION_orinoco-modules = "0.13e"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
 pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \
-wpa-supplicant-nossl ppp ppp-dialin openswan"
+wpa-supplicant ppp ppp-dialin openswan"
 
 # Misc Modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers"
diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf
index d3882b7f65..aa840586a6 100644
--- a/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -2,11 +2,10 @@
 # Don't forget to include zaurus-clamshell.conf as well
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-PREFERRED_VERSION_wpa_supplicant = "0.4.7"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
 pcmcia-cs apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
+ppp ppp-dialin openswan wpa-supplicant alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
 
 # Ethernet modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index 2238f6673e..6c857b6bb9 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
 pcmciautils apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
+ppp ppp-dialin openswan wpa-supplicant alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
 
 # Ethernet modules
 #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"