From 2afb0db9c2907b45b7d60c87aa751b21c0e20d33 Mon Sep 17 00:00:00 2001 From: cronyx Date: Mon, 16 May 2022 15:42:50 +0300 Subject: [PATCH 1/3] build TUN driver as external module in gk* same as in the hi* --- .../board/gk7205v200/kernel/gk7202v300.generic.config | 2 +- .../board/gk7205v200/kernel/gk7205v200.generic-fpv.config | 2 +- .../board/gk7205v200/kernel/gk7205v200.generic.config | 2 +- .../board/gk7205v200/kernel/gk7205v300.generic-fpv.config | 2 +- .../board/gk7205v200/kernel/gk7205v300.generic.config | 2 +- .../board/gk7205v200/kernel/gk7605v100.generic.config | 2 +- .../configs/unknown_unknown_hi3516ev200_ultimate_defconfig | 3 +++ .../configs/unknown_unknown_hi3516ev300_ultimate_defconfig | 3 +++ 8 files changed, 12 insertions(+), 6 deletions(-) diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config b/br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config index cd2a7615..792a3812 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config +++ b/br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config @@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL 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_VETH is not set # CONFIG_NLMON is not set diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic-fpv.config b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic-fpv.config index 23f69608..45e26a3c 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic-fpv.config +++ b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic-fpv.config @@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL 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_VETH is not set # CONFIG_NLMON is not set diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic.config b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic.config index 937c5010..deca3dbc 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic.config +++ b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic.config @@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL 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_VETH is not set # CONFIG_NLMON is not set diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic-fpv.config b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic-fpv.config index d0d06e47..bbdd4290 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic-fpv.config +++ b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic-fpv.config @@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL 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_VETH is not set # CONFIG_NLMON is not set diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic.config b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic.config index 7e457eed..526eb65e 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic.config +++ b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic.config @@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL 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_VETH is not set # CONFIG_NLMON is not set diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/gk7605v100.generic.config b/br-ext-chip-goke/board/gk7205v200/kernel/gk7605v100.generic.config index da857074..f8e85749 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/gk7605v100.generic.config +++ b/br-ext-chip-goke/board/gk7205v200/kernel/gk7605v100.generic.config @@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL 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_VETH is not set # CONFIG_NLMON is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig index f01b1f2b..ee5c776f 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig @@ -103,3 +103,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y # WIREGUARD BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_TOOLS=y + +# ZEROTIER +BR2_PACKAGE_ZEROTIER_ONE is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig index 8ca521c0..c59bb8d6 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig @@ -103,3 +103,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y # WIREGUARD BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_TOOLS=y + +# ZEROTIER +BR2_PACKAGE_ZEROTIER_ONE is not set From bba9d000a20835eea00e91dcdf5613267415ae6c Mon Sep 17 00:00:00 2001 From: cronyx Date: Mon, 16 May 2022 16:38:48 +0300 Subject: [PATCH 2/3] zerotier version update to 1.8.10, add package to ultimate builds --- general/package/zerotier-one/files/S90zerotier | 10 +++++++--- general/package/zerotier-one/files/zerotier.conf | 1 + general/package/zerotier-one/readme.md | 13 +++++-------- general/package/zerotier-one/zerotier-one.mk | 7 +++++-- 4 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 general/package/zerotier-one/files/zerotier.conf diff --git a/general/package/zerotier-one/files/S90zerotier b/general/package/zerotier-one/files/S90zerotier index 36aaccf9..60bcaada 100755 --- a/general/package/zerotier-one/files/S90zerotier +++ b/general/package/zerotier-one/files/S90zerotier @@ -5,9 +5,13 @@ case "$1" in start) - echo "Starting zerotier-one daemon..." - /sbin/modprobe tun - /usr/sbin/zerotier-one -d + if grep -q daemon=1 /etc/zerotier.conf; then + echo "Starting zerotier-one daemon..." + /sbin/modprobe tun + /usr/sbin/zerotier-one -d + else + echo "Zerotier-One service disabled in zerotier.conf..." + fi ;; stop) echo "Stopping zerotier-one daemon..." diff --git a/general/package/zerotier-one/files/zerotier.conf b/general/package/zerotier-one/files/zerotier.conf new file mode 100644 index 00000000..0bc970a2 --- /dev/null +++ b/general/package/zerotier-one/files/zerotier.conf @@ -0,0 +1 @@ +daemon=0 diff --git a/general/package/zerotier-one/readme.md b/general/package/zerotier-one/readme.md index 2c73de6a..0167ee2f 100644 --- a/general/package/zerotier-one/readme.md +++ b/general/package/zerotier-one/readme.md @@ -1,14 +1,11 @@ # ZeroTier One -Пакет [ZeroTier One](https://www.zerotier.com) предназначен только для локальной сборки без установки в rootfs (соотвествующая строка в .mk имеет коментарий) за исключением скрипта запуска демона и библиотеки libstdc++. После прошивки камеры, zerotier-one необходимо загрузить в /usr/sbin и создать 2 симлинка: - -``` -ln -sf zerotier-one zerotier-cli -ln -sf zerotier-one zerotier-idtool -``` -Перезапустить камеру или выполнить команду из консоли (web либо ssh): +Пакет [ZeroTier One](https://www.zerotier.com) для сборок ultimate. + +Для запуска сервиса необходимо выполнить из консоли (web либо ssh): ``` +echo "daemon=1" > /etc/zerotier.conf /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> ``` -p.s. для hi3516ev300 и gk7205v300 на базе прошивки OpenIpc, собранные пакеты можно взять [здесь](https://github.com/cronyx/zerotier-openipc), проверить наличие места в оверлее, необходимо не менее 2.5Mb, распаковать и залить все файлы согласно дереву каталогов, выполнить п.1-4 настройки и подключения. \ No newline at end of file +p.s. для hi3516ev300 и gk7205v300 на базе прошивки OpenIpc, со старой разметкой разделов, собранные пакеты можно взять [здесь](https://github.com/cronyx/zerotier-openipc), проверить наличие места в оверлее, необходимо не менее 2.5Mb, распаковать и залить все файлы согласно дереву каталогов, выполнить п.1-4 для подключения. \ No newline at end of file diff --git a/general/package/zerotier-one/zerotier-one.mk b/general/package/zerotier-one/zerotier-one.mk index 87444959..4e46b7f7 100644 --- a/general/package/zerotier-one/zerotier-one.mk +++ b/general/package/zerotier-one/zerotier-one.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZEROTIER_ONE_VERSION = 7ea2354540cd891f61d0944ff8a25c53a42bd038 +ZEROTIER_ONE_VERSION = 7e46c8359231b4aa55c5d739462c4e5682d35755 ZEROTIER_ONE_SITE = $(call github,zerotier,ZeroTierOne,$(ZEROTIER_ONE_VERSION)) # ZEROTIER_ONE_DEPENDENCIES += libminiupnpc libnatpmp ZEROTIER_ONE_LICENSE = BUSL-1.1 @@ -19,7 +19,10 @@ define ZEROTIER_ONE_BUILD_CMDS endef 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 cp ../general/package/zerotier-one/files/S90zerotier $(TARGET_DIR)/etc/init.d From 40d132460ece80cc397f05d1285bf5c065a4d164 Mon Sep 17 00:00:00 2001 From: cronyx Date: Mon, 16 May 2022 16:48:26 +0300 Subject: [PATCH 3/3] enable zerotier packages --- .../configs/unknown_unknown_gk7205v300_ultimate_defconfig | 2 +- .../configs/unknown_unknown_hi3516ev300_ultimate_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_ultimate_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_ultimate_defconfig index 99ca63dd..2f33b4df 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_ultimate_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_ultimate_defconfig @@ -100,4 +100,4 @@ BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_TOOLS=y # ZEROTIER -BR2_PACKAGE_ZEROTIER_ONE is not set +BR2_PACKAGE_ZEROTIER_ONE=y diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig index c59bb8d6..988d0f91 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig @@ -105,4 +105,4 @@ BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_TOOLS=y # ZEROTIER -BR2_PACKAGE_ZEROTIER_ONE is not set +BR2_PACKAGE_ZEROTIER_ONE=y