• R/O
  • HTTP
  • SSH
  • HTTPS

immortalwrt: Commit

Mirror only - Please move to https://github.com/immortalwrt/immortalwrt


Commit MetaInfo

Revisioncd5ba0cfbbdbefa28ea7734b3a163fa58d509184 (tree)
Zeit2022-01-17 00:28:46
AutorKarel Kočí <karel.koci@nic....>
CommiterHauke Mehrtens

Log Message

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@nic.cz>
(cherry picked from commit 219e17a35088a90eea664fbb4c66549d701a3cb4)

Ändern Zusammenfassung

Diff

--- a/package/libs/ustream-ssl/Makefile
+++ b/package/libs/ustream-ssl/Makefile
@@ -1,7 +1,7 @@
11 include $(TOPDIR)/rules.mk
22
33 PKG_NAME:=ustream-ssl
4-PKG_RELEASE:=1
4+PKG_RELEASE:=2
55
66 PKG_SOURCE_PROTO:=git
77 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git
@@ -37,6 +37,7 @@ define Package/libustream-wolfssl
3737 $(Package/libustream/default)
3838 TITLE += (wolfssl)
3939 DEPENDS += +PACKAGE_libustream-wolfssl:libwolfssl
40+ CONFLICTS := libustream-openssl
4041 VARIANT:=wolfssl
4142 endef
4243
@@ -44,6 +45,7 @@ define Package/libustream-mbedtls
4445 $(Package/libustream/default)
4546 TITLE += (mbedtls)
4647 DEPENDS += +libmbedtls
48+ CONFLICTS := libustream-openssl libustream-wolfssl
4749 VARIANT:=mbedtls
4850 DEFAULT_VARIANT:=1
4951 endef
Show on old repository browser