minor cosmetics to wpa-supplicant and let machine configurations depend on this one and not on the (now deleted) hostap-wpa-supplicant

BKrev: 41f6a973kFdVABLuKW0VC7PKl44w4g

5 files changed, 80 insertions, 3 deletions

diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf
index 2b698c9b62..30b8409814 100644
--- a/conf/machine/handheld-common.conf
+++ b/conf/machine/handheld-common.conf
@@ -17,8 +17,8 @@ input uinput \
 "
 
 # Configuration bits for "generic handheld"
-BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan hostap-wpa-supplicant-nossl lrzsz ppp-dialin scap"
+BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "pcmcia-cs apm apmd"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan hostap-wpa-supplicant-nossl lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}')}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}')}"
 
 INHERIT += "linux_modules"
diff --git a/conf/machine/openzaurus-pxa-2.6.conf b/conf/machine/openzaurus-pxa-2.6.conf
index 29b2402907..5ca82e1209 100644
--- a/conf/machine/openzaurus-pxa-2.6.conf
+++ b/conf/machine/openzaurus-pxa-2.6.conf
@@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus"
 PREFERRED_VERSION_orinoco-modules = "20050101"
 
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules    orinoco-modules \
-pcmcia-cs apmd ppp wireless-tools irda-utils openswan hostap-wpa-supplicant-nossl lrzsz ppp-dialin"
+pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel        udev sysfsutils hostap-modules-cs orinoco-modules-cs \
 pcmcia-cs apm  ppp wireless-tools irda-utils udev-utils"
 # kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
diff --git a/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb b/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb
index e69de29bb2..7c7321b7de 100644
--- a/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb
+++ b/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "User space helper for WPA and WPA2 client operations with SSL. \
+The Supplicant is used in WPA/WPA2 key handshakes to authenticate \
+with the AP and to generate dynamic encryption keys (TKIP or CCMP)."
+DEPENDSS = "openssl"
+PR = "r2"
+
+EXTRA_OEMAKE="LIBS='-L${STAGING_LIBDIR} -lssl -lcrypto' LIBS_p='-L${STAGING_LIBDIR} -lssl -lcrypto'"
+
+include wpa-supplicant_${PV}.inc
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
index e69de29bb2..b6bf4036ea 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."
+SECTION = "net"
+LICENSE = "GPL"
+MAINTAINER = "Holger Schurig"
+HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
+DEPENDS = "openssl"
+PR = "r2"
+
+SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-0.3.6.tar.gz \
+	file://defconfig \
+	file://wpa_supplicant.conf"
+S = "${WORKDIR}/wpa_supplicant-${PV}"
+
+do_configure () {
+	install -m 0755 ${WORKDIR}/defconfig  .config
+}
+
+do_compile () {
+	make
+}
+
+do_install () {
+	install -d ${D}/usr/sbin
+	install -m755 wpa_supplicant ${D}/usr/sbin
+	install -m755 wpa_passphrase ${D}/usr/sbin
+	install -m755 wpa_cli        ${D}/usr/sbin
+
+	install -d ${D}/etc
+	install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}/etc
+
+	install -d ${D}/usr/share/doc/wpa_supplicant
+	install -m644 README ${D}/usr/share/doc/wpa_supplicant
+}
diff --git a/packages/wpa-supplicant/wpa-supplicant_cvs.bb b/packages/wpa-supplicant/wpa-supplicant_cvs.bb
index e69de29bb2..17c4c6c064 100644
--- a/packages/wpa-supplicant/wpa-supplicant_cvs.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_cvs.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Client for Wi-Fi Protected Access (WPA)."
+SECTION = "net"
+LICENSE = "GPL"
+MAINTAINER = "Holger Schurig"
+HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
+DEPENDS = "openssl"
+PR = "r1"
+
+SRC_URI = "cvs://anonymous@hostap.epitest.fi/cvs;module=hostap \
+	file://defconfig \
+	file://wpa_supplicant.conf"
+S = "${WORKDIR}/hostap/wpa_supplicant"
+
+do_configure () {
+	install -m 0755 ${WORKDIR}/defconfig  .config
+}
+
+do_compile () {
+	make
+}
+
+do_install () {
+	install -d ${D}/usr/sbin
+	install -m755 wpa_supplicant ${D}/usr/sbin
+	install -m755 wpa_passphrase ${D}/usr/sbin
+	install -m755 wpa_cli        ${D}/usr/sbin
+
+	install -d ${D}/etc
+	install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}/etc
+
+	install -d ${D}/usr/share/doc/wpa_supplicant
+	install -m644 README ${D}/usr/share/doc/wpa_supplicant
+}
+
+