From 09e331107eedbf3eb53386d4b2f1196ef516fe84 Mon Sep 17 00:00:00 2001 From: Denis Osvald Date: Fri, 7 Oct 2016 17:52:36 +0200 Subject: [PATCH 1/3] libwebsockets: add full variant with libuv, plugins, CGI Signed-off-by: Denis Osvald --- libs/libwebsockets/Makefile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 26869ed74..754be43ed 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -60,6 +60,13 @@ define Package/libwebsockets-cyassl VARIANT:=cyassl endef +define Package/libwebsockets-full + $(call Package/$(PKG_NAME)/Default) + TITLE += (Full - OpenSSL, libuv, plugins, CGI) + DEPENDS += +libopenssl +libuv + VARIANT:=full +endef + ifeq ($(BUILD_VARIANT),openssl) CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON @@ -77,6 +84,17 @@ ifeq ($(BUILD_VARIANT),cyassl) CMAKE_OPTIONS += -DLWS_CYASSL_INCLUDE_DIRS=$(STAGING_DIR)/usr/include endif +ifeq ($(BUILD_VARIANT),full) + CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs + CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON + CMAKE_OPTIONS += -DLWS_WITH_SSL=ON + CMAKE_OPTIONS += -DLWS_WITH_LIBUV=ON + CMAKE_OPTIONS += -DLWS_WITH_PLUGINS=ON + CMAKE_OPTIONS += -DLWS_WITH_SERVER_STATUS=ON + CMAKE_OPTIONS += -DLWS_WITH_ACCESS_LOG=ON + CMAKE_OPTIONS += -DLWS_WITH_CGI=ON +endif + define Package/libwebsockets/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets.so* $(1)/usr/lib/ @@ -84,6 +102,8 @@ endef Package/$(PKG_NAME)-cyassl/install = $(Package/$(PKG_NAME)/install) Package/$(PKG_NAME)-openssl/install = $(Package/$(PKG_NAME)/install) +Package/$(PKG_NAME)-full/install = $(Package/$(PKG_NAME)/install) $(eval $(call BuildPackage,libwebsockets-openssl)) $(eval $(call BuildPackage,libwebsockets-cyassl)) +$(eval $(call BuildPackage,libwebsockets-full)) From 02302c5eb212c1f679c7a16ba82294950c80d376 Mon Sep 17 00:00:00 2001 From: Denis Osvald Date: Thu, 13 Oct 2016 17:23:24 +0200 Subject: [PATCH 2/3] libwebsockets: bump to v2.0.3 Signed-off-by: Denis Osvald --- libs/libwebsockets/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 754be43ed..18906b6a4 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebsockets -PKG_VERSION:=2.0.2 +PKG_VERSION:=2.0.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz From 55c38be4cca7d59152dc6d4e1e3ab19a2018e392 Mon Sep 17 00:00:00 2001 From: Denis Osvald Date: Thu, 13 Oct 2016 19:11:54 +0200 Subject: [PATCH 3/3] libwebsockets: use tarball releases instead of git Signed-off-by: Denis Osvald --- libs/libwebsockets/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 18906b6a4..cd090a7a9 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -11,10 +11,12 @@ PKG_NAME:=libwebsockets PKG_VERSION:=2.0.3 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_PROTO:=git +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_URL:=https://github.com/warmcat/libwebsockets.git +PKG_SOURCE_URL:=https://codeload.github.com/warmcat/libwebsockets/tar.gz/v$(PKG_VERSION)? +PKG_MD5SUM:=a025156d606d90579e65d53ccd062a94 + + PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)