jzy/zerotier-magisk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sadly zerotier make-linux.mk does not support armv7; update service.sh

Browse Source
This commit is contained in:
eventlOwOp
2024-05-11 14:03:58 +08:00
parent c10a31216f
commit d105f81a9d
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+20 -20
View File
@@ -70,30 +70,30 @@ jobs:
cd magisk cd magisk
zip -q -r ../zerotier-magisk-aarch64.zip . zip -q -r ../zerotier-magisk-aarch64.zip .
- name: Build for arm # - name: Build for arm
run: | # run: |
PATH=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH # PATH=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
PATH=`pwd`/libnatpmp:$PATH # PATH=`pwd`/libnatpmp:$PATH
NDK_ROOT=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64 # NDK_ROOT=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64
CC=armv7a-linux-androideabi$api_version-clang # CC=armv7a-linux-androideabi$api_version-clang
CXX=armv7a-linux-androideabi$api_version-clang++ # CXX=armv7a-linux-androideabi$api_version-clang++
cd libnatpmp # cd libnatpmp
make clean # make clean
make CC=$CC natpmpc-shared # make CC=$CC natpmpc-shared
cd .. # cd ..
cd ZeroTierOne # cd ZeroTierOne
make clean # make clean
sed -i "s/armv7ve/armv7a/g" make-linux.mk # sed -i "s/armv7ve/armv7a/g" make-linux.mk
make -j $(nproc) ZT_DEBUG=0 ZT_SSO_SUPPORTED=0 CC=$CC CXX=$CXX LDFLAGS="-L../libnatpmp" DEFS="-I../libnatpmp -D__GLIBC__=0" # make -j $(nproc) ZT_DEBUG=0 ZT_SSO_SUPPORTED=0 CC=$CC CXX=$CXX LDFLAGS="-L../libnatpmp" DEFS="-I../libnatpmp -D__GLIBC__=0"
cd .. # cd ..
cp ZeroTierOne/zerotier-one magisk/zerotier/ # cp ZeroTierOne/zerotier-one magisk/zerotier/
cp $NDK_ROOT/sysroot/usr/lib/arm-linux-android/libc++_shared.so magisk/zerotier/lib # cp $NDK_ROOT/sysroot/usr/lib/arm-linux-android/libc++_shared.so magisk/zerotier/lib
cd magisk # cd magisk
zip -q -r ../zerotier-magisk-arm.zip . # zip -q -r ../zerotier-magisk-arm.zip .
- name: Debugging with tmate - name: Debugging with tmate
uses: mxschmitt/action-tmate@v3.18 uses: mxschmitt/action-tmate@v3.18
magisk/service.sh
+6 -6
View File
@@ -13,16 +13,16 @@ log() {
echo "[$t][$$][L] $1" >> $daemon_log echo "[$t][$$][L] $1" >> $daemon_log
} }
_stop() { _stop() {
if [ $pid -eq -1 ]; then pid=$(pidof zerotier-one)
log "zerotier-one not running" if [ $? -ne 0 ]; then
log "zerotier-one not running"
return 1 return 1
fi fi
kill -9 $pid kill -9 $pid
ret=$? ret=$?
pid=-1
rm -rf ./run/pid
echo $pid > ./run/pid
if [ $ret -eq 0 ]; then if [ $ret -eq 0 ]; then
log "stopped zerotier-one" log "stopped zerotier-one"
@@ -73,7 +73,7 @@ __start() {
echo $pid > ./run/pid echo $pid > ./run/pid
} }
_start() { _start() {
if [ $pid -ne -1 ]; then if pid=$(pidof zerotier-one); then
log "zerotier-one already running" log "zerotier-one already running"
else else
__start __start