diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-13 11:15:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-13 11:15:17 +0200 |
| commit | d2f556494390602b912fac06169ea6ef7552ef2e (patch) | |
| tree | 61f8f6f18ea10c2190e6b6427a38d663854e9601 /package/wpa_supplicant | |
| parent | 556eb8fa5e8a32ea980fa5fe8db0bae77a2d898b (diff) | |
implement PKG_CHOICES
Diffstat (limited to 'package/wpa_supplicant')
| -rw-r--r-- | package/wpa_supplicant/Makefile | 19 | ||||
| -rw-r--r-- | package/wpa_supplicant/files/config | 5 |
2 files changed, 19 insertions, 5 deletions
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index a5b906c62..e9f603065 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -4,19 +4,27 @@ include ${TOPDIR}/rules.mk PKG_NAME:= wpa_supplicant -PKG_VERSION:= 0.7.1 +PKG_VERSION:= 0.7.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 02c475f949e5c131856915bbb87fa55d +PKG_MD5SUM:= 0e2cb7e4c35667351d8b7ec28c783e6a PKG_DESCR:= WPA Supplicant with support for WPA and WPA2 PKG_SECTION:= net -ifeq (${ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL},y) -PKG_DEPENDS:= libopenssl +ifeq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL},y) PKG_BUILDDEP+= openssl endif +ifeq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_GNUTLS},y) +PKG_BUILDDEP+= gnutls +endif PKG_SITES:= http://hostap.epitest.fi/releases/ WRKSRC= ${WRKDIST}/${PKG_NAME} +PKG_CHOICES:= WITH_OPENSSL WITH_GNUTLS +PKGCD_WITH_OPENSSL:= use OpenSSL for crypto +PKGCS_WITH_OPENSSL:= libopenssl +PKGCD_WITH_GNUTLS:= use GnuTLS for crypto +PKGCS_WITH_GNUTLS:= libgnutls + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -31,6 +39,9 @@ MAKE_FLAGS+= CPPFLAGS='${TCPPFLAGS}' \ do-configure: ${CP} files/config ${WRKBUILD}/.config +ifneq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_GNUTLS},) + ${SED} "s#openssl#gnutls#" ${WRKBUILD}/.config +endif do-install: ${INSTALL_DIR} ${IDIR_WPA_SUPPLICANT}/usr/sbin diff --git a/package/wpa_supplicant/files/config b/package/wpa_supplicant/files/config index c3f85d9c2..aa0ee6b17 100644 --- a/package/wpa_supplicant/files/config +++ b/package/wpa_supplicant/files/config @@ -1,8 +1,11 @@ # rather important CONFIG_DRIVER_NL80211=y -CONFIG_IEEE8021X_EAPOL=y +CONFIG_DRIVER_WEXT=y +#CONFIG_IEEE8021X_EAPOL=y CONFIG_CTRL_IFACE=y # default CONFIG_EAP_PSK=y CONFIG_EAP_MD5=y +# tls implementation +CONFIG_TLS=openssl |