Merge branch 'master' into arm64

2023-09-27 16:01:28 +01:00
parent 77706bd2f6 a0b8868fbf
commit c318daf364
31 changed files with 107 additions and 142 deletions
--- a/stage0/00-configure-apt/files/raspi.list
+++ b/stage0/00-configure-apt/files/raspi.list
@@ -1,3 +1,3 @@
-deb http://archive.raspberrypi.org/debian/ RELEASE main
+deb http://archive.raspberrypi.com/debian/ RELEASE main
 # Uncomment line below then 'apt-get update' to enable 'apt-get source'
-#deb-src http://archive.raspberrypi.org/debian/ RELEASE main
+#deb-src http://archive.raspberrypi.com/debian/ RELEASE main
--- a/stage0/02-firmware/01-packages
+++ b/stage0/02-firmware/01-packages
@@ -1,2 +1,9 @@
-raspberrypi-bootloader
-raspberrypi-kernel
+initramfs-tools
+raspi-firmware
+linux-image-rpi-v6
+linux-image-rpi-v7
+linux-image-rpi-v7l
+linux-image-rpi-v8
+linux-headers-rpi-v6
+linux-headers-rpi-v7
+linux-headers-rpi-v7l
--- a/stage0/02-firmware/02-run.sh
+++ b/stage0/02-firmware/02-run.sh
@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+sed -i 's/^update_initramfs=.*/update_initramfs=no/' "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf"
--- a/stage0/prerun.sh
+++ b/stage0/prerun.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e

-if [ "$RELEASE" != "bullseye" ]; then
+if [ "$RELEASE" != "bookworm" ]; then
 	echo "WARNING: RELEASE does not match the intended option for this branch."
 	echo "         Please check the relevant README.md section."
 fi