chore: update urls and base image version

Updates urls and uses latest bullseye image Signed-off-by: Stephan Wendel <[email protected]>
mainsail-crew · Mar 4, 2024 · a7953c8 · a7953c8
1 parent 257f28d
commit a7953c8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/config/raspberry/default b/config/raspberry/default
@@ -4,6 +4,8 @@
 # Declare Variables before exporting.
 # See https://www.shellcheck.net/wiki/SC2155
 
+DOWNLOAD_BASE_URL="https://downloads.raspberrypi.com"
+
 BASE_IMAGE_ENLARGEROOT=4500
 BASE_IMAGE_RESIZEROOT=600
 # Compress not needed due compression done in workflow
@@ -12,6 +14,7 @@ BASE_RELEASE_COMPRESS=no
 MODULES="base,pkgupgrade,udev_fix,mainsailos(net,piconfig,klipper,is_req_preinstall,moonraker,timelapse,mainsail,crowsnest,sonar,password-for-sudo),postrename"
 
 # export Variables
+export DOWNLOAD_BASE_URL
 export BASE_IMAGE_ENLARGEROOT
 export BASE_IMAGE_RESIZEROOT
 export BASE_RELEASE_COMPRESS

diff --git a/config/raspberry/rpi32 b/config/raspberry/rpi32
@@ -9,8 +9,9 @@
 # DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_armhf_latest.torrent"
 
 # New locations after Bullseye turned into 'oldstable'
-DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.com/raspios_oldstable_lite_armhf/images/raspios_oldstable_lite_armhf-2023-10-10/2023-05-03-raspios-bullseye-armhf-lite.img.xz.sha256"
-DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.com/raspios_oldstable_lite_armhf/images/raspios_oldstable_lite_armhf-2023-10-10/2023-05-03-raspios-bullseye-armhf-lite.img.xz.torrent"
+DOWNLOAD_URL_ARCH="/raspios_oldstable_lite_armhf/images/raspios_oldstable_lite_armhf-2023-12-06"
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/${DOWNLOAD_URL_ARCH}/2023-12-05-raspios-bullseye-armhf-lite.img.xz.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/2023-12-05-raspios-bullseye-armhf-lite.img.xz.torrent"
 
 export DOWNLOAD_URL_CHECKSUM
 export DOWNLOAD_URL_IMAGE

diff --git a/config/raspberry/rpi64 b/config/raspberry/rpi64
@@ -11,8 +11,9 @@ BASE_ARCH="arm64"
 # DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.torrent"
 
 # New locations after Bullseye turned into 'oldstable'
-DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.com/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-10-10/2023-05-03-raspios-bullseye-arm64-lite.img.xz.sha256"
-DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.com/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-10-10/2023-05-03-raspios-bullseye-arm64-lite.img.xz.torrent"
+DOWNLOAD_URL_ARCH="/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-12-06"
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/${DOWNLOAD_URL_ARCH}/2023-12-05-raspios-bullseye-arm64-lite.img.xz.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/${DOWNLOAD_URL_ARCH}/2023-12-05-raspios-bullseye-arm64-lite.img.xz.torrent"
 
 
 # export variables

diff --git a/config/raspberry/rpi64-ks b/config/raspberry/rpi64-ks
@@ -11,9 +11,9 @@ BASE_ARCH="arm64"
 # DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.torrent"
 
 # New locations after Bullseye turned into 'oldstable'
-DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.com/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-10-10/2023-05-03-raspios-bullseye-arm64-lite.img.xz.sha256"
-DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.com/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-10-10/2023-05-03-raspios-bullseye-arm64-lite.img.xz.torrent"
-
+DOWNLOAD_URL_ARCH="/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-12-06"
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/${DOWNLOAD_URL_ARCH}/2023-12-05-raspios-bullseye-arm64-lite.img.xz.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/${DOWNLOAD_URL_ARCH}/2023-12-05-raspios-bullseye-arm64-lite.img.xz.torrent"
 
 # Changed modules
 # shellcheck disable=SC2034