aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-05 16:41:50 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-05 16:41:50 +0000
commit6ca4824bc36c97fc1e75c8c681d0f1d027735cec (patch)
tree4ec3e2e79feae1a709ac8cf1fdb37f2bb965ffee
parent78e652f3148ccc80a37f0140711a583ed55310a8 (diff)
downloadupstream-6ca4824bc36c97fc1e75c8c681d0f1d027735cec.tar.gz
upstream-6ca4824bc36c97fc1e75c8c681d0f1d027735cec.tar.bz2
upstream-6ca4824bc36c97fc1e75c8c681d0f1d027735cec.zip
hostapd: add conflicts with wpad(-mini) to hostapd and wpa_supplicant
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42772 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/network/services/hostapd/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index f8c76cae12..6300e0203c 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -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