renamed package txt for raspberry pi specifics

AlvinSchiller · Nov 6, 2023 · 739d3cb · 739d3cb
1 parent 21ffd16
commit 739d3cb
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/ci/Dockerfile.debian b/ci/Dockerfile.debian
@@ -92,7 +92,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
   && echo "--- install internal packages ---" \
   && apt-get update \
   && sed 's/#.*//' packages.txt | sed 's/resolvconf//' | xargs apt-get -y install \
-  && sed 's/#.*//' packages-arm.txt | xargs apt-get -y install \
+  && sed 's/#.*//' packages-raspberrypi.txt | xargs apt-get -y install \
   && rm -rf /var/lib/apt/lists/*
 
 COPY --chown=root:$TEST_USER_GROUP --chmod=770 scripts/installscripts/buster-install-default.sh .

diff --git a/packages-arm.txt → packages-raspberrypi.txt b/packages-arm.txt → packages-raspberrypi.txt
diff --git a/scripts/installscripts/buster-install-default.sh b/scripts/installscripts/buster-install-default.sh
@@ -935,7 +935,7 @@ install_main() {
 
     # some packages are only available on raspberry pi's but not on test docker containers running on x86_64 machines
     if [[ $(uname -m) =~ ^armv.+$ ]]; then
-        call_with_apt_packages_from_file "${jukebox_dir}"/packages-arm.txt ${apt_get} ${allow_downgrades} install
+        call_with_apt_packages_from_file "${jukebox_dir}"/packages-raspberrypi.txt ${apt_get} ${allow_downgrades} install
     fi
 
     call_with_apt_packages_from_file "${jukebox_dir}"/packages.txt ${apt_get} ${allow_downgrades} install

diff --git a/scripts/installscripts/tests/test_installation.sh b/scripts/installscripts/tests/test_installation.sh
@@ -233,7 +233,7 @@ call_with_apt_packages_from_file() {
 verify_apt_packages() {
     local jukebox_dir="$1"
     local packages=$(call_with_apt_packages_from_file "${jukebox_dir}"/packages.txt echo)
-    local packages_raspberrypi=$(call_with_apt_packages_from_file "${jukebox_dir}"/packages-arm.txt echo)
+    local packages_raspberrypi=$(call_with_apt_packages_from_file "${jukebox_dir}"/packages-raspberrypi.txt echo)
     local packages_spotify=$(call_with_apt_packages_from_file "${jukebox_dir}"/packages-spotify.txt echo)
     local packages_autohotspot=$(call_with_apt_packages_from_file "${jukebox_dir}"/packages-autohotspot.txt echo)