diff --git a/build-images b/build-images index 0a47cc8..1ca2081 100755 --- a/build-images +++ b/build-images @@ -13,8 +13,8 @@ RASPBERRYPI_SHA_URL="$RASPBERRYPI_IMG_URL.sha256" RASPBERRYPI_IMG=raspi_4_bookworm.img # Basename for the target images: -PIROGUE34_IMG="PiRogue-OS-12-Pi3_and_Pi4-$NOW.img" -PIROGUE5E_IMG="PiRogue-OS-12-Pi5-Experimental-$NOW.img" +PIROGUE34_IMG="PiRogue-OS-12-Pi3_and_Pi4-$NOW-workshop.img" +PIROGUE5E_IMG="PiRogue-OS-12-Pi5-Experimental-$NOW-workshop.img" # List of things we produce: MANIFEST=$(realpath MANIFEST.txt) @@ -79,9 +79,9 @@ rm -f "$MANIFEST" # Modify, compress, and checksum: sudo ./toaster $RASPBERRYPI_IMG.xz "$PIROGUE34_IMG" recipes/pi3-pi4.sh - sudo ./toaster $RASPBERRYPI_IMG.xz "$PIROGUE5E_IMG" recipes/pi5.sh +# sudo ./toaster $RASPBERRYPI_IMG.xz "$PIROGUE5E_IMG" recipes/pi5.sh xz_compress "$PIROGUE34_IMG" - xz_compress "$PIROGUE5E_IMG" +# xz_compress "$PIROGUE5E_IMG" checksum_and_publish "$PIROGUE34_IMG.xz" - checksum_and_publish "$PIROGUE5E_IMG.xz" +# checksum_and_publish "$PIROGUE5E_IMG.xz" ) diff --git a/raspberrypi/recipes/pi3-pi4.sh b/raspberrypi/recipes/pi3-pi4.sh index 2baf63a..63508c3 100644 --- a/raspberrypi/recipes/pi3-pi4.sh +++ b/raspberrypi/recipes/pi3-pi4.sh @@ -35,8 +35,8 @@ toast_me() { echo "pirogue" > $MNT/etc/hostname # Add PTS PPA - chroot $MNT wget -O /etc/apt/sources.list.d/pirogue.list https://pts-project.org/debian-12/pirogue.list - chroot $MNT wget -O /etc/apt/trusted.gpg.d/pirogue.gpg https://pts-project.org/debian-12/pirogue.gpg + chroot $MNT wget -O /etc/apt/sources.list.d/pirogue.list https://pts-project.org/debian-12-workshop/pirogue.list + chroot $MNT wget -O /etc/apt/trusted.gpg.d/pirogue.asc https://pts-project.org/debian-12-workshop/Key.gpg # Make initial installation easier on users: install -m 755 -o root -g root files/avoid-debconf-prompts $MNT/root/avoid-debconf-prompts diff --git a/raspberrypi/recipes/pi5.sh b/raspberrypi/recipes/pi5.sh index 661c060..27a91f0 100644 --- a/raspberrypi/recipes/pi5.sh +++ b/raspberrypi/recipes/pi5.sh @@ -35,8 +35,8 @@ toast_me() { echo "pirogue" > $MNT/etc/hostname # Add PTS PPA - chroot $MNT wget -O /etc/apt/sources.list.d/pirogue.list https://pts-project.org/debian-12/pirogue.list - chroot $MNT wget -O /etc/apt/trusted.gpg.d/pirogue.gpg https://pts-project.org/debian-12/pirogue.gpg + chroot $MNT wget -O /etc/apt/sources.list.d/pirogue.list https://pts-project.org/debian-12-workshop/pirogue.list + chroot $MNT wget -O /etc/apt/trusted.gpg.d/pirogue.asc https://pts-project.org/debian-12-workshop/Key.gpg # Make initial installation easier on users: install -m 755 -o root -g root files/avoid-debconf-prompts $MNT/root/avoid-debconf-prompts