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>
owl
Alexis Green 2016-10-07 13:09:13 -07:00 committed by Jo-Philipp Wich
parent 6797a10fa1
commit 12f0d5402c
1 changed files with 2 additions and 1 deletions

View File

@ -216,7 +216,7 @@ endef
define Package/wpa-supplicant-mesh define Package/wpa-supplicant-mesh
$(Package/wpa-supplicant) $(Package/wpa-supplicant)
TITLE:=WPA Supplicant (with 802.11s and SAE) 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 CONFLICTS:=wpad wpad-mesh wpad-mesh
VARIANT:=supplicant-mesh VARIANT:=supplicant-mesh
endef endef
@ -400,6 +400,7 @@ define Package/wpa-supplicant/install
endef endef
Package/wpa-supplicant-mini/install = $(Package/wpa-supplicant/install) Package/wpa-supplicant-mini/install = $(Package/wpa-supplicant/install)
Package/wpa-supplicant-p2p/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) ifneq ($(LOCAL_TYPE),hostapd)
define Package/wpa-cli/install define Package/wpa-cli/install