iperf3: Fix dependecy conflict with iperf3-ssl

When selecting both iperf3 and iperf3 ssl, there is a problem that
both packages install same binary file.
This patch fixes this issue by adding conflict between those packages.

Signed-off-by: Jakub Raczynski <myszsoda@gmail.com>
(cherry picked from commit cea45c75c0153a190ee41dedaf6526ae08e33928)

diff --git a/net/iperf3/Makefile b/net/iperf3/Makefile
index fa41fd54535f3966e20c6e5dd8fe3abb7b6cf631..2bd9275cb926264879d8eb878a8f6e8b9356af7e 100644 (file)
--- a/net/iperf3/Makefile
+++ b/net/iperf3/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iperf
 PKG_VERSION:=3.15
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.es.net/pub/iperf
@@ -46,6 +46,7 @@ $(call Package/iperf3/default)
   TITLE+= with iperf_auth support
   VARIANT:=ssl
   DEPENDS:=+libopenssl
+  CONFLICTS:=iperf3
 endef
 
 define Package/libiperf3