hassio-addons/addon-zerotier
1
0
Fork 0
mirror of https://github.com/hassio-addons/addon-zerotier.git synced 2025-05-04 19:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade ZeroTier to 1.6.2 (#31)

Browse source
This commit is contained in:
Franck Nijhof 2021-02-02 00:26:57 +01:00 • committed by GitHub
parent 6b9996d107
commit 32146d7314
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zerotier/Dockerfile
View file

@ -5,9 +5,6 @@ FROM ${BUILD_FROM}
# Set shell # Set shell
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# We need to copy in the patches need during build
COPY rootfs/patches /patches
# Setup base # Setup base
# hadolint ignore=DL3003 # hadolint ignore=DL3003
RUN \ RUN \
@ -20,11 +17,10 @@ RUN \
libgcc=10.2.1_pre1-r3 \ libgcc=10.2.1_pre1-r3 \
libstdc++=10.2.1_pre1-r3 \ libstdc++=10.2.1_pre1-r3 \
\ \
&& git clone --branch "1.4.6" --depth=1 \ && git clone --branch "1.6.2" --depth=1 \
"https://github.com/zerotier/ZeroTierOne.git" /tmp/zerotier \ "https://github.com/zerotier/ZeroTierOne.git" /tmp/zerotier \
\ \
&& cd /tmp/zerotier \ && cd /tmp/zerotier \
&& patch -p1 < /patches/ZeroTierOne/gcc9-compat.patch \
&& make \ && make \
&& make install \ && make install \
\ \

21
zerotier/rootfs/patches/ZeroTierOne/gcc9-compat.patch
View file

@ -1,21 +0,0 @@
diff --git a/make-linux.mk b/make-linux.mk
index 9fd4f7b9..c409ce0b 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -260,12 +260,12 @@ endif
# ARM32 hell -- use conservative CFLAGS
ifeq ($(ZT_ARCHITECTURE),3)
ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel)
- override CFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
- override CXXFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
+ override CFLAGS+=-march=armv6 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
+ override CXXFLAGS+=-march=armv6 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
ZT_USE_ARM32_NEON_ASM_CRYPTO=0
else
- override CFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions
- override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions
+ override CFLAGS+=-march=armv6 -mno-unaligned-access -marm -fexceptions
+ override CXXFLAGS+=-march=armv6 -mno-unaligned-access -marm -fexceptions
ZT_USE_ARM32_NEON_ASM_CRYPTO=0
endif
endif