diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-28 17:19:48 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-28 17:19:48 +0000 |
| commit | ff6f6c121d494f2ce951a524d4c9f06ebba0b468 (patch) | |
| tree | 154279fc1993ef20c9a6dceb00e54ab4034925cd /package/network/services/hostapd/Makefile | |
| parent | 1f13cddc10692d266e8dd29fe4e4607080f13122 (diff) | |
| download | master-187ad058-ff6f6c121d494f2ce951a524d4c9f06ebba0b468.tar.gz master-187ad058-ff6f6c121d494f2ce951a524d4c9f06ebba0b468.tar.bz2 master-187ad058-ff6f6c121d494f2ce951a524d4c9f06ebba0b468.zip | |
hostapd: fix wpad-mesh and wpa-supplicant-mesh configuration issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48528 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/hostapd/Makefile')
| -rw-r--r-- | package/network/services/hostapd/Makefile | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index 5c6e981a59..dba29dd1e3 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -40,6 +40,10 @@ LOCAL_TYPE=$(strip \ hostapd \ ))) LOCAL_VARIANT=$(patsubst wpad-%,%,$(patsubst supplicant-%,%,$(BUILD_VARIANT))) +CONFIG_VARIANT:=$(LOCAL_VARIANT) +ifeq ($(LOCAL_VARIANT),mesh) + CONFIG_VARIANT:=full +endif ifeq ($(LOCAL_TYPE),supplicant) ifeq ($(LOCAL_VARIANT),full) @@ -47,10 +51,6 @@ ifeq ($(LOCAL_TYPE),supplicant) CONFIG_WPA_SUPPLICANT_INTERNAL \ CONFIG_WPA_SUPPLICANT_OPENSSL endif - ifeq ($(LOCAL_VARIANT),mesh) - PKG_CONFIG_DEPENDS += \ - CONFIG_WPA_SUPPLICANT_OPENSSL - endif endif PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) @@ -82,7 +82,7 @@ ifneq ($(LOCAL_TYPE),hostapd) endif endif ifeq ($(LOCAL_VARIANT),mesh) - DRIVER_MAKEOPTS += CONFIG_TLS=openssl + DRIVER_MAKEOPTS += CONFIG_TLS=openssl CONFIG_AP=y CONFIG_SAE=y CONFIG_MESH=y TARGET_LDFLAGS += -lcrypto -lssl endif ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK @@ -177,8 +177,7 @@ endef define Package/wpad-mesh $(call Package/wpad/Default) TITLE+= (with 802.11s mesh and SAE support) - DEPENDS:=$(DRV_DEPENDS) +libubus +PACKAGE_wpad-mesh:libopenssl +@CONFIG_WPA_SUPPLICANT_OPENSSL @(!TARGET_uml||BROKEN) - CONFLICTS:=@WPA_SUPPLICANT_INTERNAL + DEPENDS:=$(DRV_DEPENDS) +libubus +PACKAGE_wpad-mesh:libopenssl @(!TARGET_uml||BROKEN) VARIANT:=wpad-mesh endef @@ -284,10 +283,10 @@ endif define Build/Configure $(Build/Configure/rebuild) - $(if $(wildcard ./files/hostapd-$(LOCAL_VARIANT).config), \ - $(CP) ./files/hostapd-$(LOCAL_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config \ + $(if $(wildcard ./files/hostapd-$(CONFIG_VARIANT).config), \ + $(CP) ./files/hostapd-$(CONFIG_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config \ ) - $(CP) ./files/wpa_supplicant-$(LOCAL_VARIANT).config $(PKG_BUILD_DIR)/wpa_supplicant/.config + $(CP) ./files/wpa_supplicant-$(CONFIG_VARIANT).config $(PKG_BUILD_DIR)/wpa_supplicant/.config endef TARGET_CPPFLAGS := \ |