OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

External ONVIF integration, jump to mbedtls, add new 4G modem (#912)

pull/885/head
Igor Zalatov 2023-07-14 17:11:28 +03:00 committed by GitHub
parent 5963ddc337
commit 1c8af5e6e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
br-ext-chip-hisilicon/configs/hi3518ev200_lite_defconfig
View File

@ -110,6 +110,9 @@ BR2_PACKAGE_MOSQUITTO=y
# FEATURES
# BR2_PACKAGE_COMGT is not set
# EXPERIMENTAL
BR2_PACKAGE_ONVIF_SIMPLE_SERVER=y
# DEBUG
# BR2_PACKAGE_HOST_GDB is not set
# BR2_PACKAGE_GDB is not set

3
br-ext-chip-ingenic/configs/t31_lite_defconfig
View File

@ -107,6 +107,9 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y
BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
BR2_PACKAGE_WIREGUARD_TOOLS=y
# EXPERIMENTAL
BR2_PACKAGE_ONVIF_SIMPLE_SERVER=y
# DEBUG
# BR2_PACKAGE_HOST_GDB is not set
# BR2_PACKAGE_GDB is not set

10
general/overlay/etc/wireless
View File

@ -76,12 +76,22 @@ if [ "$1" = "ec200-t31-camhi" ]; then
exit 0
fi
# T31 CamHi with Quectel EC800G-CN and usb0
if [ "$1" = "ec800-t31-camhi" ]; then
set_gpio 61 0
modprobe usbserial vendor=0x2c7c product=0x904
modprobe rndis_host
sleep 10
exit 0
fi
# T31 CamHi with Fibocom L610-CN and usb0
if [ "$1" = "l610-t31-camhi" ]; then
set_gpio 61 0
modprobe usbserial vendor=0x1782 product=0x4d11
modprobe rndis_host
sleep 10
echo "AT+GTRNDIS=1,2" >/dev/ttyUSB0
exit 0
fi

18
general/package/onvif-simple-server/01-enable-mbedtls-only.patch 100644
View File

@ -0,0 +1,18 @@
--- a/Makefile 2023-07-04 13:52:08.000000000 +0300
+++ b/Makefile 2023-07-11 00:10:53.987288000 +0300
@@ -2,13 +2,8 @@
OBJECTS_O = onvif_simple_server.o device_service.o media_service.o ptz_service.o utils.o log.o
OBJECTS_W = wsd_simple_server.o utils.o log.o
-ifdef HAVE_MBEDTLS
-INCLUDE = -DHAVE_MBEDTLS -I../mbedtls/include -ffunction-sections -fdata-sections
-LIBS_O = -Wl,--gc-sections ../mbedtls/library/libmbedcrypto.a -lpthread
-else
-INCLUDE = -I../libtomcrypt/src/headers -ffunction-sections -fdata-sections
-LIBS_O = -Wl,--gc-sections ../libtomcrypt/libtomcrypt.a -lpthread
-endif
+INCLUDE = -DHAVE_MBEDTLS -ffunction-sections -fdata-sections
+LIBS_O = -Wl,--gc-sections -lmbedtls -lmbedcrypto -lpthread
LIBS_W = -Wl,--gc-sections
all: onvif_simple_server wsd_simple_server

12
general/package/onvif-simple-server/01-removing-old-anchors.patch
View File

@ -1,12 +0,0 @@
--- a/Makefile 2023-06-20 14:53:35.000000000 +0300
+++ b/Makefile 2023-07-02 17:55:34.483218477 +0300
@@ -1,7 +1,7 @@
OBJECTS_O = onvif_simple_server.o device_service.o media_service.o ptz_service.o utils.o log.o
OBJECTS_W = wsd_simple_server.o utils.o log.o
-INCLUDE = -I../libtomcrypt/src/headers -ffunction-sections -fdata-sections
-LIBS_O = -Wl,--gc-sections ../libtomcrypt/libtomcrypt.a -lpthread
+INCLUDE = -ffunction-sections -fdata-sections
+LIBS_O = -Wl,--gc-sections -lpthread -ltomcrypt
LIBS_W = -Wl,--gc-sections
all: onvif_simple_server wsd_simple_server

2
general/package/onvif-simple-server/Config.in
View File

@ -1,8 +1,6 @@
config BR2_PACKAGE_ONVIF_SIMPLE_SERVER
bool "onvif-simple-server"
default n
#select BR2_PACKAGE_LIBTOMCRYPT
#depends on BR2_INSTALL_LIBTOMCRYPT
help
onvif_simple_server is a C light implementation of an onvif
server intended for use in resource-constrained devices

4
general/package/onvif-simple-server/onvif-simple-server.mk
View File

@ -6,9 +6,9 @@
ONVIF_SIMPLE_SERVER_SITE_METHOD = git
ONVIF_SIMPLE_SERVER_SITE = https://github.com/roleoroleo/onvif_simple_server
ONVIF_SIMPLE_SERVER_VERSION = 8a19b6662af3ab123bb000a09710728cc355359c
ONVIF_SIMPLE_SERVER_VERSION = 7dc083fdd2a3cf3465945616c6d8d15e200a5707
ONVIF_SIMPLE_SERVER_DEPENDENCIES = libtomcrypt
ONVIF_SIMPLE_SERVER_DEPENDENCIES = mbedtls-openipc
ONVIF_SIMPLE_SERVER_LICENSE = MIT
ONVIF_SIMPLE_SERVER_LICENSE_FILES = LICENSE