Merge pull request #89 from jaysonsantos/zerotier-without-entware

Add zerotier without entware depdenency

.gitignore

@@ -9,6 +9,8 @@ wdpk/*/work*
 wdpk/*/*.sign
 wdpk/*/*.xml
 
+wdpk/zerotier/bin/
+
 .env
 
 toolchains/*/work*

wdpk/zerotier/Dockerfile

@@ -0,0 +1,5 @@
+FROM rustembedded/cross:arm-unknown-linux-gnueabihf
+RUN cd /usr/src && curl -sLO https://github.com/zerotier/ZeroTierOne/archive/refs/tags/1.6.4.tar.gz && tar zxvf 1.6.4.tar.gz && rm 1.6.4.tar.gz
+ENV CC=arm-linux-gnueabihf-gcc
+ENV CXX=arm-linux-gnueabihf-g++
+ENV STRIP=arm-linux-gnueabihf-strip

wdpk/zerotier/Makefile

@@ -0,0 +1,8 @@
+SRC := compile-in-docker.sh Dockerfile
+all: bin/zerotier-one
+
+.PHONY: all
+
+bin/zerotier-one: $(SRC)
+	./compile-in-docker.sh
+

wdpk/zerotier/apkg.rc

@@ -1,5 +1,5 @@
 Package:	zerotier
-Version:	1.6.3
+Version:	1.6.4
 Packager:	TFL
 Email:
 Homepage:	http://www.zerotier.com

wdpk/zerotier/build.sh

@@ -1,15 +1,14 @@
 #!/bin/sh
-
+set -e
 APP_NAME="$(basename $(pwd))"
-DATE="$(date +"%m%d%Y")"
-CWD="$(pwd)"
 VERSION="$(awk '/Version/{print $NF}' apkg.rc)"
 
 echo "Building ${APP_NAME} version ${VERSION}"
 
 MODELS="MyCloudEX2Ultra"
 
 for model in $MODELS; do
+  make
   ../../mksapkg-OS5 -E -s -m $model > /dev/null
 done
 

wdpk/zerotier/cgi-bin/zerotier.py

@@ -1,37 +1,43 @@
 #!/usr/bin/env python3
 import cgitb
-import re
+
 cgitb.enable()
+
 import cgi
 import os
+import re
 import subprocess
 
-print('Content-type: text/plain')
-print('')
+os.environ["PATH"] += os.path.pathsep + "/mnt/HD/HD_a2/Nas_Prog/zerotier/bin/"
+os.environ["ZEROTIER_HOME"] = "/mnt/HD/HD_a2/.systemfile/zerotier"
+print("Content-type: text/plain")
+print("")
+
 
 def list_networks():
-    print('<pre>')
-    print('command output')
-    output = subprocess.check_output(["/opt/bin/zerotier-cli", "listnetworks"])
-    print(output.decode('utf-8'))
-    print('</pre>')
+    print("<pre>")
+    print("command output")
+    output = subprocess.check_output(["zerotier-cli", "listnetworks"])
+    print(output.decode("utf-8"))
+    print("</pre>")
 
 
 def join_network():
-    print('<pre>')
+    print("<pre>")
     form = cgi.FieldStorage()
-    network_name = form['network_name'].value.strip()
-    match = re.match('^[0-9a-f]+$', network_name)
+    network_name = form["network_name"].value.strip()
+    match = re.match("^[0-9a-f]+$", network_name)
     if not match:
-        print(f'Not a valid network name {network_name!r}')
+        print(f"Not a valid network name {network_name!r}")
         exit(0)
 
-    print(f'trying to join {network_name!r}')
-    output = subprocess.check_output(["/opt/bin/zerotier-cli", "join", network_name])
-    print(output.decode('utf-8'))
-    print('</pre>')
+    print(f"trying to join {network_name!r}")
+    output = subprocess.check_output(["zerotier-cli", "join", network_name])
+    print(output.decode("utf-8"))
+    print("</pre>")
+
 
-if os.environ['REQUEST_METHOD'] != 'GET':
+if os.environ["REQUEST_METHOD"] != "GET":
     join_network()
     exit(0)
 

wdpk/zerotier/compile-in-docker.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+docker build -t zerotier .
+docker run \
+    -v $PWD/bin:/usr/src/bin --rm -it \
+    -e ME="$(id -u):$(id -g)" \
+    zerotier \
+    bash -exc 'cd /usr/src/ZeroTier* && make -j8 ZT_DISABLE_COMPRESSION=1 && cp zerotier-one /usr/src/bin/ && chown -R $ME /usr/src/bin/'
+
+cd bin
+for link in zerotier-cli zerotier-idtool;
+do
+    ln -sf zerotier-one $link
+done
+cd ..

wdpk/zerotier/install.sh

@@ -7,5 +7,3 @@ NAS_PROG=$(readlink -f $2)
 
 # install all package scripts to the proper location
 cp -rfv ${INSTALL_DIR} ${NAS_PROG} &2>&1 >> $DEBUG_FILE
-
-/opt/bin/opkg install zerotier &2>&1 >> $DEBUG_FILE

wdpk/zerotier/remove.sh

@@ -3,7 +3,5 @@
 
 path=$1
 
-/opt/bin/opkg remove zerotier
-
 rm -rf $path
 rm -rf "/var/www/apps/zerotier/"

wdpk/zerotier/start.sh

@@ -1,4 +1,7 @@
-#! /bin/sh
-[ -f /tmp/debug_apkg ] && echo "APKG_DEBUG: $0 $@" >> /tmp/debug_apkg
+#!/bin/bash
+[ -f /tmp/debug_apkg ] && echo "APKG_DEBUG: $0 $@ $PWD" >> /tmp/debug_apkg
 
-/opt/bin/zerotier-one -d
+export ZEROTIER_HOME=/mnt/HD/HD_a2/.systemfile/zerotier
+mkdir -p "$ZEROTIER_HOME"
+
+$1/bin/zerotier-one -d