From: Karel Kočí Date: Mon, 21 Jun 2021 09:42:25 +0000 (+0200) Subject: ustream-ssl: variants conflict with each other X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=219e17a35088a90eea664fbb4c66549d701a3cb4;p=openwrt%2Fstaging%2Fjow.git ustream-ssl: variants conflict with each other This adds conflicts between variants of libustream pacakge. They provide the same file and thus it should not be possible to install them side by side. Signed-off-by: Karel Kočí --- diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile index 3d1e48dcbd..f762c89d29 100644 --- a/package/libs/ustream-ssl/Makefile +++ b/package/libs/ustream-ssl/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ustream-ssl -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git @@ -37,6 +37,7 @@ define Package/libustream-wolfssl $(Package/libustream/default) TITLE += (wolfssl) DEPENDS += +PACKAGE_libustream-wolfssl:libwolfssl + CONFLICTS := libustream-openssl VARIANT:=wolfssl endef @@ -44,6 +45,7 @@ define Package/libustream-mbedtls $(Package/libustream/default) TITLE += (mbedtls) DEPENDS += +libmbedtls + CONFLICTS := libustream-openssl libustream-wolfssl VARIANT:=mbedtls DEFAULT_VARIANT:=1 endef