From 77e682a11c53f4dcd0e76bdea5ee82de77eaacfe Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Tue, 25 Oct 2022 07:52:15 +0200 Subject: [PATCH 1/2] libwebsockets: full variant provides OpenSSL For some time, it is not possible to install ttyd and mosquitto-ssl at the same time, so let's solve it that libwebsockets-full provides libwebsockets-openssl. This allows to install ttyd and mosquitto at the same time. Also, we need to add conflict, because we should not have installed libwebsockets-openssl and libwebsockets-full at the same time as they provides the same files. Signed-off-by: Josef Schlehofer --- libs/libwebsockets/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 22eb9aa76..49a4381f7 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -56,6 +56,7 @@ define Package/libwebsockets-openssl TITLE += (OpenSSL) DEPENDS += +libopenssl VARIANT:=openssl + CONFLICTS:=libwebsockets-full endef define Package/libwebsockets-mbedtls @@ -70,6 +71,7 @@ define Package/libwebsockets-full TITLE += (Full - OpenSSL, libuv, plugins, CGI) DEPENDS += +libopenssl +libuv VARIANT:=full + PROVIDES:=libwebsockets-openssl endef ifeq ($(BUILD_VARIANT),openssl) From 676c5c72b5eeb583da2603e399fac085fa442c59 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Tue, 25 Oct 2022 12:14:25 +0200 Subject: [PATCH 2/2] libwebsockets: OpenSSL and mbedTLS variants should conflict They provide the same files, but they don't conflict to each other, this means that users can install them side by side. Signed-off-by: Josef Schlehofer --- libs/libwebsockets/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 49a4381f7..617523a27 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -64,6 +64,7 @@ define Package/libwebsockets-mbedtls TITLE += (mbedTLS) DEPENDS += +libmbedtls VARIANT:=mbedtls + CONFLICTS:=libwebsockets-openssl endef define Package/libwebsockets-full