KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hostapd: add conflicts with wpad(-mini) to hostapd and wpa_supplicant

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42772
This commit is contained in:
Felix Fietkau 2014-10-05 16:41:50 +00:00
parent c6ebce701e
commit bf0305725a
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package/network/services/hostapd/Makefile
View file

@ -105,6 +105,7 @@ define Package/hostapd
$(call Package/hostapd/Default) $(call Package/hostapd/Default)
TITLE+= (full) TITLE+= (full)
VARIANT:=full VARIANT:=full
CONFLICTS:=wpad wpad-mini
endef endef
define Package/hostapd/description define Package/hostapd/description
@ -116,6 +117,7 @@ define Package/hostapd-mini
$(call Package/hostapd/Default) $(call Package/hostapd/Default)
TITLE+= (WPA-PSK only) TITLE+= (WPA-PSK only)
VARIANT:=mini VARIANT:=mini
CONFLICTS:=wpad wpad-mini
endef endef
define Package/hostapd-mini/description define Package/hostapd-mini/description
@ -169,6 +171,7 @@ define Package/wpa-supplicant
TITLE:=WPA Supplicant TITLE:=WPA Supplicant
URL:=http://hostap.epitest.fi/wpa_supplicant/ URL:=http://hostap.epitest.fi/wpa_supplicant/
DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl
CONFLICTS:=wpad wpad-mini
VARIANT:=supplicant-full VARIANT:=supplicant-full
endef endef
@ -184,6 +187,7 @@ define Package/wpa-supplicant-p2p
$(Package/wpa-supplicant) $(Package/wpa-supplicant)
TITLE:=WPA Supplicant (with Wi-Fi P2P support) TITLE:=WPA Supplicant (with Wi-Fi P2P support)
DEPENDS:=$(DRV_DEPENDS) DEPENDS:=$(DRV_DEPENDS)
CONFLICTS:=wpad wpad-mini
VARIANT:=supplicant-p2p VARIANT:=supplicant-p2p
endef endef
@ -195,6 +199,7 @@ define Package/wpa-supplicant-mini
$(Package/wpa-supplicant) $(Package/wpa-supplicant)
TITLE:=WPA Supplicant (minimal version) TITLE:=WPA Supplicant (minimal version)
DEPENDS:=$(DRV_DEPENDS) DEPENDS:=$(DRV_DEPENDS)
CONFLICTS:=wpad wpad-mini
VARIANT:=supplicant-mini VARIANT:=supplicant-mini
endef endef