diff options
Diffstat (limited to 'package/hostapd/Makefile')
-rw-r--r-- | package/hostapd/Makefile | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 2fbfb98e3c..485a8fad0c 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -8,16 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd -PKG_VERSION:=20120910 +PKG_VERSION:=20130405 PKG_RELEASE:=1 -PKG_REV:=762b99db7a76803d1ad274e87caa6fe870d47441 +PKG_REV:=f2f66ad7e805218468aa041985dccaf8719c296e PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_PROTO:=git -PKG_MIRROR_MD5SUM:=fa3227c146cb50732fe8511ce6d1d862 +PKG_MIRROR_MD5SUM:=5dff9bc3b8fbd9ef8a66273d5adee5a3 + +PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org> PKG_BUILD_PARALLEL:=1 @@ -84,15 +86,14 @@ ifneq ($(LOCAL_TYPE),hostapd) CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch) endif -DRV_DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny @(!(TARGET_avr32||TARGET_etrax)||BROKEN) +DRV_DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny @(!TARGET_avr32||BROKEN) define Package/hostapd/Default SECTION:=net CATEGORY:=Network TITLE:=IEEE 802.1x Authenticator URL:=http://hostap.epitest.fi/ - DEPENDS:=$(DRV_DEPENDS) - MAINTAINER:=Felix Fietkau <nbd@openwrt.org> + DEPENDS:=$(DRV_DEPENDS) +libubus endef define Package/hostapd @@ -132,13 +133,12 @@ define Package/wpad/Default CATEGORY:=Network TITLE:=IEEE 802.1x Authenticator/Supplicant URL:=http://hostap.epitest.fi/ - MAINTAINER:=Felix Fietkau <nbd@openwrt.org> endef define Package/wpad $(call Package/wpad/Default) TITLE+= (full) - DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl + DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl +libubus VARIANT:=wpad-full endef @@ -150,7 +150,7 @@ endef define Package/wpad-mini $(call Package/wpad/Default) TITLE+= (WPA-PSK only) - DEPENDS:=$(DRV_DEPENDS) + DEPENDS:=$(DRV_DEPENDS) +libubus VARIANT:=wpad-mini endef @@ -165,7 +165,6 @@ define Package/wpa-supplicant URL:=http://hostap.epitest.fi/wpa_supplicant/ DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl VARIANT:=supplicant-full - MAINTAINER:=Felix Fietkau <nbd@openwrt.org> endef define Package/wpa-supplicant/Description @@ -192,7 +191,6 @@ define Package/wpa-cli CATEGORY:=Network DEPENDS:=@PACKAGE_wpa-supplicant||PACKAGE_wpad-mini||PACKAGE_wpad TITLE:=WPA Supplicant command line interface - MAINTAINER:=Felix Fietkau <nbd@openwrt.org> endef define Package/wpa-cli/Description @@ -220,13 +218,16 @@ TARGET_CPPFLAGS := \ -I$(STAGING_DIR)/usr/include/libnl-tiny \ -I$(PKG_BUILD_DIR)/src/crypto \ $(TARGET_CPPFLAGS) \ - -I$(STAGING_DIR)/usr/include/madwifi \ + -I$(CURDIR)/madwifi \ -DCONFIG_LIBNL20 \ -D_GNU_SOURCE \ $(if $(CONFIG_WPA_MSG_MIN_PRIORITY),-DCONFIG_MSG_MIN_PRIORITY=$(CONFIG_WPA_MSG_MIN_PRIORITY)) TARGET_CFLAGS += -ffunction-sections -fdata-sections TARGET_LDFLAGS += -Wl,--gc-sections +ifeq ($(findstring supplicant,$(BUILD_VARIANT)),) + TARGET_LDFLAGS += -lubox -lubus +endif ifdef CONFIG_PACKAGE_kmod-mac80211 TARGET_LDFLAGS += -lm -lnl-tiny @@ -305,6 +306,11 @@ ifneq ($(LOCAL_TYPE),supplicant) $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/hotplug.d/button $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd_cli $(1)/usr/sbin/ $(INSTALL_DATA) ./files/wps-hotplug.sh $(1)/etc/hotplug.d/button/50-wps + $(if $(CONFIG_PROCD_INIT), + $(INSTALL_DIR) $(1)/etc/rc.button/ + $(INSTALL_BIN) ./files/wps-hotplug.sh $(1)/etc/rc.button/wps, + $(INSTALL_DATA) ./files/wps-hotplug.sh $(1)/etc/hotplug.d/button/50-wps + ) endef endif |