aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis Green <agreen@cococorp.com>2016-10-07 13:09:13 -0700
committerJo-Philipp Wich <jo@mein.io>2016-10-31 13:46:01 +0100
commit12f0d5402c69b991f00a956ee084aa087a90fadb (patch)
tree8821369736a3c107fefe06456ede99e1cc25a713
parent6797a10fa198727022fe5b9581b416ebfe97ea1f (diff)
downloadupstream-12f0d5402c69b991f00a956ee084aa087a90fadb.tar.gz
upstream-12f0d5402c69b991f00a956ee084aa087a90fadb.tar.bz2
upstream-12f0d5402c69b991f00a956ee084aa087a90fadb.zip
hostapd: properly package wpa-supplicant-mesh
Ensure that selecting the wpa-supplicant-mesh package actually packages the wpa_supplicant binary with SAE support and add missing dependency on OpenSSL. Signed-off-by: Alexis Green <alexis@cessp.it> [Jo-Philipp Wich: slightly reword commit message for clarity] Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--package/network/services/hostapd/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index 330bd071ce..b3cd80d132 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -216,7 +216,7 @@ endef
define Package/wpa-supplicant-mesh
$(Package/wpa-supplicant)
TITLE:=WPA Supplicant (with 802.11s and SAE)
- DEPENDS:=$(DRV_DEPENDS) @PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN)
+ DEPENDS:=$(DRV_DEPENDS) +PACKAGE_wpa-supplicant-mesh:libopenssl @PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN)
CONFLICTS:=wpad wpad-mesh wpad-mesh
VARIANT:=supplicant-mesh
endef
@@ -400,6 +400,7 @@ define Package/wpa-supplicant/install
endef
Package/wpa-supplicant-mini/install = $(Package/wpa-supplicant/install)
Package/wpa-supplicant-p2p/install = $(Package/wpa-supplicant/install)
+Package/wpa-supplicant-mesh/install = $(Package/wpa-supplicant/install)
ifneq ($(LOCAL_TYPE),hostapd)
define Package/wpa-cli/install