pi-hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2024-10-26 16:52:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use armv6 soft-float for the arm build

Browse Source 
There have been a few issues trying to support armv6 hard-float, notably
nettle crashes even when not using DNSSEC. This change will also
increase the amount of devices able to run FTL by supporting armv6
devices without hard-float. The performance impact is expected to be
low.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
This commit is contained in:
Mcat12
2019-01-19 13:41:22 -08:00
parent 908ccc58a4
commit bfcaa9f412
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/arm/Dockerfile
+4 -18
View File
@@ -1,22 +1,8 @@
FROM debian:stretch
RUN dpkg --add-architecture armhf && \
RUN dpkg --add-architecture armel && \
apt-get update && \
apt-get install -y --no-install-recommends nettle-dev:armhf \
make file wget netcat-traditional sqlite3 git ca-certificates ssh
apt-get install -y --no-install-recommends nettle-dev:armel gcc-arm-linux-gnueabi libc6-dev-armel-cross \
make file wget netcat-traditional sqlite3 git ca-certificates ssh libcap-dev:armel
# Use Raspbian's GCC
# This command was taken from https://github.com/dockcross/dockcross/blob/master/linux-armv6/Dockerfile
# Slightly modified from the original
RUN mkdir rpi_tools && cd rpi_tools && git init && git remote add origin https://github.com/raspberrypi/tools && \
git config core.sparseCheckout true && \
echo "arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64" >> .git/info/sparse-checkout && \
git pull --depth=1 origin master && \
cp -a arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/* /usr/ && rm -rf ../rpi_tools
RUN wget ftl.pi-hole.net/libraries/libgmp.a -O /usr/local/lib/libgmp.a && \
wget ftl.pi-hole.net/libraries/libnettle.a -O /usr/local/lib/libnettle.a && \
wget ftl.pi-hole.net/libraries/libhogweed.a -O /usr/local/lib/libhogweed.a
# Allow libnettle to be used, because this GCC doesn't have all the right header and library directories
ENV CC "arm-linux-gnueabihf-gcc -I/usr/include -I/usr/include/arm-linux-gnueabihf"
ENV CC arm-linux-gnueabi-gcc