diff --git a/br-ext-chip-ambarella/package/libwebsockets-openipc b/br-ext-chip-ambarella/package/libwebsockets-openipc new file mode 120000 index 00000000..9c7dd982 --- /dev/null +++ b/br-ext-chip-ambarella/package/libwebsockets-openipc @@ -0,0 +1 @@ +../../general/package/libwebsockets-openipc \ No newline at end of file diff --git a/br-ext-chip-anyka/package/libwebsockets-openipc b/br-ext-chip-anyka/package/libwebsockets-openipc new file mode 120000 index 00000000..9c7dd982 --- /dev/null +++ b/br-ext-chip-anyka/package/libwebsockets-openipc @@ -0,0 +1 @@ +../../general/package/libwebsockets-openipc \ No newline at end of file diff --git a/br-ext-chip-fullhan/package/libwebsockets-openipc b/br-ext-chip-fullhan/package/libwebsockets-openipc new file mode 120000 index 00000000..9c7dd982 --- /dev/null +++ b/br-ext-chip-fullhan/package/libwebsockets-openipc @@ -0,0 +1 @@ +../../general/package/libwebsockets-openipc \ No newline at end of file diff --git a/br-ext-chip-goke/package/libwebsockets-openipc b/br-ext-chip-goke/package/libwebsockets-openipc new file mode 120000 index 00000000..9c7dd982 --- /dev/null +++ b/br-ext-chip-goke/package/libwebsockets-openipc @@ -0,0 +1 @@ +../../general/package/libwebsockets-openipc \ No newline at end of file diff --git a/br-ext-chip-grainmedia/package/libwebsockets-openipc b/br-ext-chip-grainmedia/package/libwebsockets-openipc new file mode 120000 index 00000000..9c7dd982 --- /dev/null +++ b/br-ext-chip-grainmedia/package/libwebsockets-openipc @@ -0,0 +1 @@ +../../general/package/libwebsockets-openipc \ No newline at end of file diff --git a/br-ext-chip-hisilicon/Config.in b/br-ext-chip-hisilicon/Config.in index 6be9e5a0..fea336de 100644 --- a/br-ext-chip-hisilicon/Config.in +++ b/br-ext-chip-hisilicon/Config.in @@ -20,6 +20,7 @@ source "$BR2_EXTERNAL_HISILICON_PATH/package/libevent-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/libhv-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/libogg-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/libsrt-openipc/Config.in" +source "$BR2_EXTERNAL_HISILICON_PATH/package/libwebsockets-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/linux-firmware-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/majestic-fonts/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/majestic-hi3516av100/Config.in" diff --git a/br-ext-chip-hisilicon/external.mk b/br-ext-chip-hisilicon/external.mk index 87088d81..7176c06c 100644 --- a/br-ext-chip-hisilicon/external.mk +++ b/br-ext-chip-hisilicon/external.mk @@ -20,6 +20,7 @@ include $(BR2_EXTERNAL_HISILICON_PATH)/package/libevent-openipc/libevent-openipc include $(BR2_EXTERNAL_HISILICON_PATH)/package/libhv-openipc/libhv-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/libsrt-openipc/libsrt-openipc.mk +include $(BR2_EXTERNAL_HISILICON_PATH)/package/libwebsockets-openipc/libsrt-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic-hi3516av100/majestic-hi3516av100.mk diff --git a/br-ext-chip-hisilicon/package/libwebsockets-openipc b/br-ext-chip-hisilicon/package/libwebsockets-openipc new file mode 120000 index 00000000..9c7dd982 --- /dev/null +++ b/br-ext-chip-hisilicon/package/libwebsockets-openipc @@ -0,0 +1 @@ +../../general/package/libwebsockets-openipc \ No newline at end of file diff --git a/br-ext-chip-ingenic/package/libwebsockets-openipc b/br-ext-chip-ingenic/package/libwebsockets-openipc new file mode 120000 index 00000000..9c7dd982 --- /dev/null +++ b/br-ext-chip-ingenic/package/libwebsockets-openipc @@ -0,0 +1 @@ +../../general/package/libwebsockets-openipc \ No newline at end of file diff --git a/br-ext-chip-novatek/package/libwebsockets-openipc b/br-ext-chip-novatek/package/libwebsockets-openipc new file mode 120000 index 00000000..9c7dd982 --- /dev/null +++ b/br-ext-chip-novatek/package/libwebsockets-openipc @@ -0,0 +1 @@ +../../general/package/libwebsockets-openipc \ No newline at end of file diff --git a/br-ext-chip-sigmastar/package/libwebsockets-openipc b/br-ext-chip-sigmastar/package/libwebsockets-openipc new file mode 120000 index 00000000..9c7dd982 --- /dev/null +++ b/br-ext-chip-sigmastar/package/libwebsockets-openipc @@ -0,0 +1 @@ +../../general/package/libwebsockets-openipc \ No newline at end of file diff --git a/br-ext-chip-xiongmai/package/libwebsockets-openipc b/br-ext-chip-xiongmai/package/libwebsockets-openipc new file mode 120000 index 00000000..9c7dd982 --- /dev/null +++ b/br-ext-chip-xiongmai/package/libwebsockets-openipc @@ -0,0 +1 @@ +../../general/package/libwebsockets-openipc \ No newline at end of file diff --git a/general/package/libwebsockets-openipc/Config.in b/general/package/libwebsockets-openipc/Config.in index 1d927bb4..dc17bc60 100644 --- a/general/package/libwebsockets-openipc/Config.in +++ b/general/package/libwebsockets-openipc/Config.in @@ -1,5 +1,5 @@ -config BR2_PACKAGE_LIBWEBSOCKETS - bool "libwebsockets" +config BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC + bool "libwebsockets-openipc" select BR2_PACKAGE_ZLIB help Libwebsockets is a lightweight pure C library built to use diff --git a/general/package/libwebsockets-openipc/libwebsockets.mk b/general/package/libwebsockets-openipc/libwebsockets.mk index dedd0334..f69630af 100644 --- a/general/package/libwebsockets-openipc/libwebsockets.mk +++ b/general/package/libwebsockets-openipc/libwebsockets.mk @@ -1,62 +1,62 @@ ################################################################################ # -# libwebsockets +# libwebsockets-openipc # ################################################################################ -LIBWEBSOCKETS_VERSION = 3.2.2 -LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION)) -LIBWEBSOCKETS_LICENSE = LGPL-2.1 with exceptions -LIBWEBSOCKETS_LICENSE_FILES = LICENSE -LIBWEBSOCKETS_DEPENDENCIES = zlib -LIBWEBSOCKETS_INSTALL_STAGING = YES -LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON -DLWS_IPV6=ON +LIBWEBSOCKETS_OPENIPC_VERSION = 3.2.2 +LIBWEBSOCKETS_OPENIPC_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_OPENIPC_VERSION)) +LIBWEBSOCKETS_OPENIPC_LICENSE = LGPL-2.1 with exceptions +LIBWEBSOCKETS_OPENIPC_LICENSE_FILES = LICENSE +LIBWEBSOCKETS_OPENIPC_DEPENDENCIES = zlib +LIBWEBSOCKETS_OPENIPC_INSTALL_STAGING = YES +LIBWEBSOCKETS_OPENIPC_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON -DLWS_IPV6=ON # If LWS_MAX_SMP=1, then there is no code related to pthreads compiled # in the library. If unset, LWS_MAX_SMP defaults to 32 and a small # amount of pthread mutex code is built into the library. ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -LIBWEBSOCKETS_CONF_OPTS += -DLWS_MAX_SMP=1 +LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_MAX_SMP=1 else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_MAX_SMP= +LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_MAX_SMP= endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBWEBSOCKETS_DEPENDENCIES += openssl host-openssl -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=ON +LIBWEBSOCKETS_OPENIPC_DEPENDENCIES += openssl host-openssl +LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_WITH_SSL=ON else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=OFF +LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_WITH_SSL=OFF endif ifeq ($(BR2_PACKAGE_LIBEV),y) -LIBWEBSOCKETS_DEPENDENCIES += libev -LIBWEBSOCKETS_CONF_OPTS += \ +LIBWEBSOCKETS_OPENIPC_DEPENDENCIES += libev +LIBWEBSOCKETS_OPENIPC_CONF_OPTS += \ -DLWS_WITH_LIBEV=ON \ -DLWS_WITH_LIBEVENT=OFF else ifeq ($(BR2_PACKAGE_LIBEVENT),y) -LIBWEBSOCKETS_DEPENDENCIES += libevent -LIBWEBSOCKETS_CONF_OPTS += \ +LIBWEBSOCKETS_OPENIPC_DEPENDENCIES += libevent +LIBWEBSOCKETS_OPENIPC_CONF_OPTS += \ -DLWS_WITH_LIBEV=OFF \ -DLWS_WITH_LIBEVENT=ON else -LIBWEBSOCKETS_CONF_OPTS += \ +LIBWEBSOCKETS_OPENIPC_CONF_OPTS += \ -DLWS_WITH_LIBEV=OFF \ -DLWS_WITH_LIBEVENT=OFF endif ifeq ($(BR2_PACKAGE_LIBUV),y) -LIBWEBSOCKETS_DEPENDENCIES += libuv -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBUV=ON +LIBWEBSOCKETS_OPENIPC_DEPENDENCIES += libuv +LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_WITH_LIBUV=ON else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBUV=OFF +LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_WITH_LIBUV=OFF endif ifeq ($(BR2_STATIC_LIBS),y) -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SHARED=OFF +LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_WITH_SHARED=OFF endif ifeq ($(BR2_SHARED_LIBS),y) -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_STATIC=OFF +LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_WITH_STATIC=OFF endif $(eval $(cmake-package))