[openwrt/openwrt] ustream-ssl: variants conflict with each other
LEDE Commits
lede-commits at lists.infradead.org
Mon Jun 21 21:48:18 PDT 2021
aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/219e17a35088a90eea664fbb4c66549d701a3cb4
commit 219e17a35088a90eea664fbb4c66549d701a3cb4
Author: Karel Kočí <karel.koci at nic.cz>
AuthorDate: Mon Jun 21 11:42:25 2021 +0200
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čí <karel.koci at nic.cz>
---
package/libs/ustream-ssl/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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
More information about the lede-commits
mailing list