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

Merge pull request #227 from cronyx/master 

add zerotier package to the ultimate builds
pull/228/head
Igor Zalatov 2022-05-16 16:51:52 +03:00 committed by GitHub
parent fc8ed8f763 40d132460e
commit fbf84f8e8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config
View File

@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y
# CONFIG_NETCONSOLE is not set # CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set # CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=y CONFIG_TUN=m
# CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_TUN_VNET_CROSS_LE is not set
# CONFIG_VETH is not set # CONFIG_VETH is not set
# CONFIG_NLMON is not set # CONFIG_NLMON is not set

2
br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic-fpv.config
View File

@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y
# CONFIG_NETCONSOLE is not set # CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set # CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=y CONFIG_TUN=m
# CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_TUN_VNET_CROSS_LE is not set
# CONFIG_VETH is not set # CONFIG_VETH is not set
# CONFIG_NLMON is not set # CONFIG_NLMON is not set

2
br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic.config
View File

@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y
# CONFIG_NETCONSOLE is not set # CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set # CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=y CONFIG_TUN=m
# CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_TUN_VNET_CROSS_LE is not set
# CONFIG_VETH is not set # CONFIG_VETH is not set
# CONFIG_NLMON is not set # CONFIG_NLMON is not set

2
br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic-fpv.config
View File

@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y
# CONFIG_NETCONSOLE is not set # CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set # CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=y CONFIG_TUN=m
# CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_TUN_VNET_CROSS_LE is not set
# CONFIG_VETH is not set # CONFIG_VETH is not set
# CONFIG_NLMON is not set # CONFIG_NLMON is not set

2
br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic.config
View File

@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y
# CONFIG_NETCONSOLE is not set # CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set # CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=y CONFIG_TUN=m
# CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_TUN_VNET_CROSS_LE is not set
# CONFIG_VETH is not set # CONFIG_VETH is not set
# CONFIG_NLMON is not set # CONFIG_NLMON is not set

2
br-ext-chip-goke/board/gk7205v200/kernel/gk7605v100.generic.config
View File

@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y
# CONFIG_NETCONSOLE is not set # CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set # CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=y CONFIG_TUN=m
# CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_TUN_VNET_CROSS_LE is not set
# CONFIG_VETH is not set # CONFIG_VETH is not set
# CONFIG_NLMON is not set # CONFIG_NLMON is not set

2
br-ext-chip-goke/configs/unknown_unknown_gk7205v300_ultimate_defconfig
View File

@ -100,4 +100,4 @@ BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
BR2_PACKAGE_WIREGUARD_TOOLS=y BR2_PACKAGE_WIREGUARD_TOOLS=y
# ZEROTIER # ZEROTIER
BR2_PACKAGE_ZEROTIER_ONE is not set BR2_PACKAGE_ZEROTIER_ONE=y

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

@ -103,3 +103,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y
# WIREGUARD # WIREGUARD
BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
BR2_PACKAGE_WIREGUARD_TOOLS=y BR2_PACKAGE_WIREGUARD_TOOLS=y
# ZEROTIER
BR2_PACKAGE_ZEROTIER_ONE is not set

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

@ -103,3 +103,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y
# WIREGUARD # WIREGUARD
BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
BR2_PACKAGE_WIREGUARD_TOOLS=y BR2_PACKAGE_WIREGUARD_TOOLS=y
# ZEROTIER
BR2_PACKAGE_ZEROTIER_ONE=y

10
general/package/zerotier-one/files/S90zerotier
View File

@ -5,9 +5,13 @@
case "$1" in case "$1" in
start) start)
echo "Starting zerotier-one daemon..." if grep -q daemon=1 /etc/zerotier.conf; then
/sbin/modprobe tun echo "Starting zerotier-one daemon..."
/usr/sbin/zerotier-one -d /sbin/modprobe tun
/usr/sbin/zerotier-one -d
else
echo "Zerotier-One service disabled in zerotier.conf..."
fi
;; ;;
stop) stop)
echo "Stopping zerotier-one daemon..." echo "Stopping zerotier-one daemon..."

1
general/package/zerotier-one/files/zerotier.conf 100644
View File

@ -0,0 +1 @@
daemon=0

13
general/package/zerotier-one/readme.md
View File

@ -1,14 +1,11 @@
# ZeroTier One # ZeroTier One
Пакет [ZeroTier One](https://www.zerotier.com) предназначен только для локальной сборки без установки в rootfs (соотвествующая строка в .mk имеет коментарий) за исключением скрипта запуска демона и библиотеки libstdc++. После прошивки камеры, zerotier-one необходимо загрузить в /usr/sbin и создать 2 симлинка: Пакет [ZeroTier One](https://www.zerotier.com) для сборок ultimate.
``` Для запуска сервиса необходимо выполнить из консоли (web либо ssh):
ln -sf zerotier-one zerotier-cli
ln -sf zerotier-one zerotier-idtool
```
Перезапустить камеру или выполнить команду из консоли (web либо ssh):
``` ```
echo "daemon=1" > /etc/zerotier.conf
/etc/init.d/S90zerotier start /etc/init.d/S90zerotier start
``` ```
@ -32,4 +29,4 @@ zerotier-cli join network_id где (ID сети полученный на эт
zerotier-cli leave network_id где (ID сети полученный на этапе 2) в ответ будет отображен статус: <200 leave OK> zerotier-cli leave network_id где (ID сети полученный на этапе 2) в ответ будет отображен статус: <200 leave OK>
``` ```
p.s. для hi3516ev300 и gk7205v300 на базе прошивки OpenIpc, собранные пакеты можно взять [здесь](https://github.com/cronyx/zerotier-openipc), проверить наличие места в оверлее, необходимо не менее 2.5Mb, распаковать и залить все файлы согласно дереву каталогов, выполнить п.1-4 настройки и подключения. p.s. для hi3516ev300 и gk7205v300 на базе прошивки OpenIpc, со старой разметкой разделов, собранные пакеты можно взять [здесь](https://github.com/cronyx/zerotier-openipc), проверить наличие места в оверлее, необходимо не менее 2.5Mb, распаковать и залить все файлы согласно дереву каталогов, выполнить п.1-4 для подключения.

7
general/package/zerotier-one/zerotier-one.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
ZEROTIER_ONE_VERSION = 7ea2354540cd891f61d0944ff8a25c53a42bd038 ZEROTIER_ONE_VERSION = 7e46c8359231b4aa55c5d739462c4e5682d35755
ZEROTIER_ONE_SITE = $(call github,zerotier,ZeroTierOne,$(ZEROTIER_ONE_VERSION)) ZEROTIER_ONE_SITE = $(call github,zerotier,ZeroTierOne,$(ZEROTIER_ONE_VERSION))
# ZEROTIER_ONE_DEPENDENCIES += libminiupnpc libnatpmp # ZEROTIER_ONE_DEPENDENCIES += libminiupnpc libnatpmp
ZEROTIER_ONE_LICENSE = BUSL-1.1 ZEROTIER_ONE_LICENSE = BUSL-1.1
@ -19,7 +19,10 @@ define ZEROTIER_ONE_BUILD_CMDS
endef endef
define ZEROTIER_ONE_INSTALL_TARGET_CMDS define ZEROTIER_ONE_INSTALL_TARGET_CMDS
# $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
cp ../general/package/zerotier-one/files/zerotier.conf $(TARGET_DIR)/etc
$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
cp ../general/package/zerotier-one/files/S90zerotier $(TARGET_DIR)/etc/init.d cp ../general/package/zerotier-one/files/S90zerotier $(TARGET_DIR)/etc/init.d