hak5/wifipineapple-openwrt
1
0
Fork 0
mirror of https://github.com/hak5/wifipineapple-openwrt.git synced 2025-10-29 16:57:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42772 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
Felix Fietkau
2014-10-05 16:41:50 +00:00
parent 78e652f314
commit 6ca4824bc3
1 changed files with 5 additions and 0 deletions
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)
TITLE+= (full)
VARIANT:=full
CONFLICTS:=wpad wpad-mini
endef
define Package/hostapd/description
@@ -116,6 +117,7 @@ define Package/hostapd-mini
$(call Package/hostapd/Default)
TITLE+= (WPA-PSK only)
VARIANT:=mini
CONFLICTS:=wpad wpad-mini
endef
define Package/hostapd-mini/description
@@ -169,6 +171,7 @@ define Package/wpa-supplicant
TITLE:=WPA Supplicant
URL:=http://hostap.epitest.fi/wpa_supplicant/
DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl
CONFLICTS:=wpad wpad-mini
VARIANT:=supplicant-full
endef
@@ -184,6 +187,7 @@ define Package/wpa-supplicant-p2p
$(Package/wpa-supplicant)
TITLE:=WPA Supplicant (with Wi-Fi P2P support)
DEPENDS:=$(DRV_DEPENDS)
CONFLICTS:=wpad wpad-mini
VARIANT:=supplicant-p2p
endef
@@ -195,6 +199,7 @@ define Package/wpa-supplicant-mini
$(Package/wpa-supplicant)
TITLE:=WPA Supplicant (minimal version)
DEPENDS:=$(DRV_DEPENDS)
CONFLICTS:=wpad wpad-mini
VARIANT:=supplicant-mini
endef