Merge branch 'master' of github.com:OpenIPC/firmware

pull/136/head
Dmitry Ermakov 2022-01-01 15:43:50 +03:00
commit d17e2fadac
20 changed files with 103 additions and 19 deletions

View File

@ -0,0 +1 @@
../../general/package/libwebsockets-openipc

View File

@ -0,0 +1 @@
../../general/package/libwebsockets-openipc

View File

@ -0,0 +1 @@
../../general/package/libwebsockets-openipc

View File

@ -0,0 +1 @@
../../general/package/libwebsockets-openipc

View File

@ -0,0 +1 @@
../../general/package/libwebsockets-openipc

View File

@ -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"

View File

@ -1891,7 +1891,7 @@ CONFIG_USB_XHCI_PLATFORM=y
#
# also be needed; see USB_STORAGE Help for more info
#
CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE is not set
# CONFIG_USB_STORAGE_DEBUG is not set
# CONFIG_USB_STORAGE_REALTEK is not set
# CONFIG_USB_STORAGE_DATAFAB is not set
@ -2047,7 +2047,7 @@ CONFIG_USB_U_SERIAL=m
CONFIG_USB_U_ETHER=m
CONFIG_USB_F_ECM=m
CONFIG_USB_F_RNDIS=m
CONFIG_USB_F_MASS_STORAGE=m
# CONFIG_USB_F_MASS_STORAGE is not set
CONFIG_USB_CONFIGFS=m
# CONFIG_USB_CONFIGFS_SERIAL is not set
CONFIG_USB_CONFIGFS_ACM=y

View File

@ -67,7 +67,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y
BR2_PACKAGE_LIBEVENT_OPENIPC=y
BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y
BR2_PACKAGE_LIBOGG_OPENIPC=y
BR2_PACKAGE_LIBWEBSOCKETS=y
BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC_HI3516AV100=y

View File

@ -67,7 +67,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y
BR2_PACKAGE_LIBEVENT_OPENIPC=y
BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y
BR2_PACKAGE_LIBOGG_OPENIPC=y
BR2_PACKAGE_LIBWEBSOCKETS=y
BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC_HI3516EV300=y

View File

@ -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/libwebsockets-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

View File

@ -0,0 +1 @@
../../general/package/libwebsockets-openipc

View File

@ -0,0 +1 @@
../../general/package/libwebsockets-openipc

View File

@ -0,0 +1 @@
../../general/package/libwebsockets-openipc

View File

@ -0,0 +1 @@
../../general/package/libwebsockets-openipc

View File

@ -0,0 +1 @@
../../general/package/libwebsockets-openipc

View File

@ -338,16 +338,17 @@ xm550() {
# hi3518ev200_hs303v3 # testing..
#
# hi3516av100 # OpenIPC
hi3516dv100 # OpenIPC
# hi3516cv300 # testing..
# hi3516ev100 # testing..
# hi3516dv100 # OpenIPC
#
# hi3516cv300 # OpenIPC
# hi3516ev100 # OpenIPC
#
# hi3516dv200 # OpenIPC
# hi3516ev200 # OpenIPC
# hi3516ev200_dozor # Dozor
# hi3516ev200_eltis # Eltis
# hi3516ev200_vixand # Vixand
# hi3516ev300 # OpenIPC
hi3516ev300 # OpenIPC
# hi3516ev300_dev # OpenIPC development
# hi3516ev300_glibc # testing..
# hi3516ev300_tehshield # Tehshield

View File

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.31.1
# Tue Dec 7 10:02:42 2021
# Thu Dec 30 21:29:59 2021
#
CONFIG_HAVE_DOT_CONFIG=y

View File

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.31.1
# Tue Dec 7 10:02:42 2021
# Thu Dec 30 21:29:59 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@ -334,10 +334,10 @@ CONFIG_BASE64=y
# CONFIG_UUENCODE is not set
CONFIG_WC=y
# CONFIG_FEATURE_WC_LARGE is not set
CONFIG_WHOAMI=y
CONFIG_WHO=y
CONFIG_W=y
# CONFIG_USERS is not set
CONFIG_WHOAMI=y
CONFIG_YES=y
#
@ -511,10 +511,10 @@ CONFIG_FEATURE_SHADOWPASSWDS=y
# CONFIG_USE_BB_SHADOW is not set
CONFIG_USE_BB_CRYPT=y
CONFIG_USE_BB_CRYPT_SHA=y
CONFIG_ADDGROUP=y
# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
# CONFIG_ADD_SHELL is not set
# CONFIG_REMOVE_SHELL is not set
CONFIG_ADDGROUP=y
# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
CONFIG_ADDUSER=y
# CONFIG_FEATURE_CHECK_NAMES is not set
CONFIG_LAST_ID=60000
@ -713,7 +713,7 @@ CONFIG_VOLUMEID=y
# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
CONFIG_FEATURE_VOLUMEID_EXFAT=y
CONFIG_FEATURE_VOLUMEID_EXT=y
# CONFIG_FEATURE_VOLUMEID_EXT is not set
CONFIG_FEATURE_VOLUMEID_F2FS=y
CONFIG_FEATURE_VOLUMEID_FAT=y
# CONFIG_FEATURE_VOLUMEID_HFS is not set
@ -723,7 +723,7 @@ CONFIG_FEATURE_VOLUMEID_FAT=y
# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
# CONFIG_FEATURE_VOLUMEID_LUKS is not set
CONFIG_FEATURE_VOLUMEID_MINIX=y
# CONFIG_FEATURE_VOLUMEID_MINIX is not set
# CONFIG_FEATURE_VOLUMEID_NILFS is not set
# CONFIG_FEATURE_VOLUMEID_NTFS is not set
# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
@ -772,10 +772,10 @@ CONFIG_CRONTAB=y
# CONFIG_FEATURE_DEVFS is not set
CONFIG_DEVMEM=y
# CONFIG_FBSPLASH is not set
CONFIG_FLASHCP=y
CONFIG_FLASH_ERASEALL=y
# CONFIG_FLASH_LOCK is not set
CONFIG_FLASH_UNLOCK=y
CONFIG_FLASHCP=y
CONFIG_HDPARM=y
CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@ -826,13 +826,13 @@ CONFIG_STRINGS=y
CONFIG_TIME=y
CONFIG_TS=y
# CONFIG_TTYSIZE is not set
CONFIG_UBIRENAME=y
# CONFIG_UBIATTACH is not set
# CONFIG_UBIDETACH is not set
# CONFIG_UBIMKVOL is not set
# CONFIG_UBIRMVOL is not set
# CONFIG_UBIRSVOL is not set
# CONFIG_UBIUPDATEVOL is not set
CONFIG_UBIRENAME=y
# CONFIG_VOLNAME is not set
CONFIG_WATCHDOG=y
@ -939,8 +939,8 @@ CONFIG_FEATURE_FANCY_PING=y
CONFIG_ROUTE=y
# CONFIG_SLATTACH is not set
# CONFIG_SSL_CLIENT is not set
CONFIG_TC=y
CONFIG_FEATURE_TC_INGRESS=y
# CONFIG_TC is not set
# CONFIG_FEATURE_TC_INGRESS is not set
# CONFIG_TCPSVD is not set
# CONFIG_UDPSVD is not set
CONFIG_TELNET=y

View File

@ -0,0 +1,9 @@
config BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC
bool "libwebsockets-openipc"
select BR2_PACKAGE_ZLIB
help
Libwebsockets is a lightweight pure C library built to use
minimal CPU and memory resources, and provide fast throughput
in both directions.
http://libwebsockets.org/

View File

@ -0,0 +1,62 @@
################################################################################
#
# libwebsockets-openipc
#
################################################################################
LIBWEBSOCKETS_OPENIPC_VERSION = 4.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_OPENIPC_CONF_OPTS += -DLWS_MAX_SMP=1
else
LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_MAX_SMP=
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBWEBSOCKETS_OPENIPC_DEPENDENCIES += openssl host-openssl
LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_WITH_SSL=ON
else
LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_WITH_SSL=OFF
endif
ifeq ($(BR2_PACKAGE_LIBEV),y)
LIBWEBSOCKETS_OPENIPC_DEPENDENCIES += libev
LIBWEBSOCKETS_OPENIPC_CONF_OPTS += \
-DLWS_WITH_LIBEV=ON \
-DLWS_WITH_LIBEVENT=OFF
else ifeq ($(BR2_PACKAGE_LIBEVENT),y)
LIBWEBSOCKETS_OPENIPC_DEPENDENCIES += libevent
LIBWEBSOCKETS_OPENIPC_CONF_OPTS += \
-DLWS_WITH_LIBEV=OFF \
-DLWS_WITH_LIBEVENT=ON
else
LIBWEBSOCKETS_OPENIPC_CONF_OPTS += \
-DLWS_WITH_LIBEV=OFF \
-DLWS_WITH_LIBEVENT=OFF
endif
ifeq ($(BR2_PACKAGE_LIBUV),y)
LIBWEBSOCKETS_OPENIPC_DEPENDENCIES += libuv
LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_WITH_LIBUV=ON
else
LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_WITH_LIBUV=OFF
endif
ifeq ($(BR2_STATIC_LIBS),y)
LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_WITH_SHARED=OFF
endif
ifeq ($(BR2_SHARED_LIBS),y)
LIBWEBSOCKETS_OPENIPC_CONF_OPTS += -DLWS_WITH_STATIC=OFF
endif
$(eval $(cmake-package))