Drop ARMv6 support

JasonLG1979 · JasonLG1979 · commit 345f15c5d695 · 2022-02-04T19:26:14.000-06:00
It is with a heavy heart that I do this but we are reaching the limits of the Pi 1 and Zero v1.x CPU (they aren't powerful enough for volume normalization) and librespot will soon be merging a rewrite that is incompatible with ARMv6 (it will not compile).

The upside to this is that since we are now purely relying on vanilla Debian Stable for our libs (except librespot ofc) that should mean wider compatability with other Debian based armhf distros and it opens up the possibility of including the pulseaudio backend in the builds.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,8 @@ FROM debian:stable
 
 ENV INSIDE_DOCKER_CONTAINER 1
 
-RUN dpkg --add-architecture arm64
+RUN dpkg --add-architecture arm64 \
+    && dpkg --add-architecture armhf
 
 RUN apt-get update \
     && apt-get -y upgrade \
@@ -11,6 +12,8 @@ RUN apt-get update \
         libasound2-dev \
         crossbuild-essential-arm64 \
         libasound2-dev:arm64 \
+        crossbuild-essential-armhf \
+        libasound2-dev:armhf \
         curl \
         git \
         pandoc \
@@ -24,35 +27,20 @@ RUN pip3 install \
         jinja2-cli \
         unidecode
 
-RUN mkdir /toolchain
-WORKDIR /toolchain
-
-# Check out Raspbian cross-compiler (this will work on *ALL* Raspberry Pi versions)
-RUN git clone --depth 1 git://github.com/raspberrypi/tools.git rpi-tools \
-    && rm -rf rpi-tools/.git
-ENV PATH "/toolchain/rpi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/:${PATH}"
-
-# Create wrapper around gcc to point to rpi sysroot
-# Thanks @ https://github.com/herrernst/librespot/blob/build-rpi/.travis.yml
-RUN echo '#!/bin/sh\narm-linux-gnueabihf-gcc --sysroot /toolchain/rpi-tools/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/sysroot "$@"' \
-        > rpi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/gcc-wrapper \
-    && chmod +x rpi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/gcc-wrapper \
-    && ln -s ld-linux.so.3 rpi-tools/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/sysroot/lib/ld-linux-armhf.so.3
-
-# Install alsa-utils which is needed for compilation
 ENV PKG_CONFIG_ALLOW_CROSS 1
-ENV PKG_CONFIG_PATH "/toolchain/rpi-tools/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/sysroot/lib/pkgconfig"
-RUN curl -O https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.6.tar.bz2 \
-    && tar xvjf alsa-lib-1.2.6.tar.bz2 && cd alsa-lib-1.2.6 \
-    && CC=arm-linux-gnueabihf-gcc ./configure --host=arm-linux-gnueabihf --disable-python \
-        --prefix=/toolchain/rpi-tools/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/sysroot \
-    && make -j $(nproc --all) && make install \
-    && cd .. && rm -rf alsa-lib-1.2.6.tar.bz2 alsa-lib-1.2.6
+ENV PKG_CONFIG_PATH "/usr/lib/arm-linux-gnueabihf/pkgconfig"
 
 RUN mkdir /build
 
-# Install most recent version of rust
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 ENV PATH "/root/.cargo/bin/:$PATH"
 ENV CARGO_TARGET_DIR "/build"
 ENV CARGO_HOME "/build/cache"
+
+RUN rustup target add aarch64-unknown-linux-gnu \
+    && rustup target add armv7-unknown-linux-gnueabihf
+
+RUN mkdir /.cargo
+
+RUN echo '[target.aarch64-unknown-linux-gnu]\nlinker = "aarch64-linux-gnu-gcc"' > /.cargo/config \
+    && echo '[target.armv7-unknown-linux-gnueabihf]\nlinker = "arm-linux-gnueabihf-gcc"' >> /.cargo/config
diff --git a/Makefile b/Makefile
@@ -10,8 +10,7 @@ raspotify_*.deb:
 			--env PERMFIX_UID="$$(id -u)" \
 			--env PERMFIX_GID="$$(id -g)" \
 			--env RASPOTIFY_AUTHOR="$(RASPOTIFY_AUTHOR)" \
-			--env BUILD_TARGET="arm-unknown-linux-gnueabihf" \
-			--env BUILD_LINKER="gcc-wrapper" \
+			--env BUILD_TARGET="armv7-unknown-linux-gnueabihf" \
 			--env ARCHITECTURE="armhf" \
 		raspotify /mnt/raspotify/build.sh
 	docker run \
@@ -21,7 +20,6 @@ raspotify_*.deb:
 			--env PERMFIX_GID="$$(id -g)" \
 			--env RASPOTIFY_AUTHOR="$(RASPOTIFY_AUTHOR)" \
 			--env BUILD_TARGET="aarch64-unknown-linux-gnu" \
-			--env BUILD_LINKER="aarch64-linux-gnu-gcc" \
 			--env ARCHITECTURE="arm64" \
 		raspotify /mnt/raspotify/build.sh
 	docker run \
@@ -31,7 +29,6 @@ raspotify_*.deb:
 			--env PERMFIX_GID="$$(id -g)" \
 			--env RASPOTIFY_AUTHOR="$(RASPOTIFY_AUTHOR)" \
 			--env BUILD_TARGET="x86_64-unknown-linux-gnu" \
-			--env BUILD_LINKER="x86_64-linux-gnu-gcc" \
 			--env ARCHITECTURE="amd64" \
 		raspotify /mnt/raspotify/build.sh
 
diff --git a/build.sh b/build.sh
@@ -10,11 +10,6 @@ echo 'Building in docker container'
 set -e
 cd /mnt/raspotify
 
-# Install the gcc wrapper in container into cargo
-mkdir -p /.cargo
-echo "[target.${BUILD_TARGET}]\nlinker = \"${BUILD_LINKER}\"" > /.cargo/config
-rustup target add $BUILD_TARGET
-
 # Get the git rev of raspotify for .deb versioning
 RASPOTIFY_GIT_VER="$(git describe --tags --always --dirty 2>/dev/null || echo unknown)"
 
diff --git a/install.sh b/install.sh
@@ -5,8 +5,8 @@ SOURCE_REPO="deb [signed-by=/usr/share/keyrings/raspotify_key.asc] https://dtcoo
 # Install script for Raspotify. Adds the Debian repo and installs.
 set -e
 
-if ! which apt-get apt-key > /dev/null || uname -a | fgrep -ivq -e arm -e aarch64 -e x86_64; then
-    echo "The Raspotify installer only runs on armhf, arm64, and amd64 Debian based systems."
+if ! which apt-get apt-key > /dev/null || uname -a | fgrep -ivq -e armv7 -e aarch64 -e x86_64; then
+    echo "The Raspotify installer only runs on armhf (ARMv7), arm64, and amd64 Debian based systems."
     exit 1
 fi
 
diff --git a/raspotify/lib/systemd/system/raspotify.service b/raspotify/lib/systemd/system/raspotify.service
@@ -56,7 +56,7 @@ RemoveIPC=true
 
 CapabilityBoundingSet=
 
-#SystemCallArchitectures=native
+SystemCallArchitectures=native
 SystemCallFilter=@system-service
 SystemCallFilter=~@privileged @resources
 SystemCallErrorNumber=EPERM
