Merge branch 'master' into arm64

export-image/prerun.sh

@@ -46,6 +46,7 @@ if [ "${NO_PRERUN_QCOW2}" = "0" ]; then
 		fi
 	done
 
+	ensure_loopdev_partitions "$LOOP_DEV"
 	BOOT_DEV="${LOOP_DEV}p1"
 	ROOT_DEV="${LOOP_DEV}p2"
 

export-noobs/00-release/files/release_notes.txt

@@ -1,4 +1,6 @@
 UNRELEASED:
+  * Fix Raspberry Pi Imager's WLAN configuration for lite images
+2023-12-05:
   * Serial port switching in rc_gui and raspi-config modified to support Raspberry Pi 5
   * Touch screens now identified with unique per-device strings to enable correct association with display devices
   * Compatibility with RP1 displays added

export-noobs/prerun.sh

@@ -22,6 +22,7 @@ until ensure_next_loopdev && LOOP_DEV="$(losetup --show --find --partscan "$IMG_
 	fi
 done
 
+ensure_loopdev_partitions "$LOOP_DEV"
 BOOT_DEV="${LOOP_DEV}p1"
 ROOT_DEV="${LOOP_DEV}p2"
 

scripts/common

@@ -111,3 +111,17 @@ ensure_next_loopdev() {
 	[[ -b "$loopdev" ]] || mknod "$loopdev" b 7 "$loopmaj"
 }
 export -f ensure_next_loopdev
+
+ensure_loopdev_partitions() {
+	local line
+	local partition
+	local majmin
+	lsblk -r -n -o "NAME,MAJ:MIN" "$1" | grep -v "^${1#/dev/} " | while read -r line; do
+		partition="${line%% *}"
+		majmin="${line#* }"
+		if [ ! -b "/dev/$partition" ]; then
+			mknod "/dev/$partition" b "${majmin%:*}" "${majmin#*:}"
+		fi
+	done
+}
+export -f ensure_loopdev_partitions

stage0/00-configure-apt/00-run.sh

@@ -14,8 +14,13 @@ fi
 
 cat files/raspberrypi.gpg.key | gpg --dearmor > "${STAGE_WORK_DIR}/raspberrypi-archive-stable.gpg"
 install -m 644 "${STAGE_WORK_DIR}/raspberrypi-archive-stable.gpg" "${ROOTFS_DIR}/etc/apt/trusted.gpg.d/"
-on_chroot << EOF
+on_chroot <<- \EOF
-dpkg --add-architecture armhf
+	ARCH="$(dpkg --print-architecture)"
-apt-get update
+	if [ "$ARCH" = "armhf" ]; then
-apt-get dist-upgrade -y
+		dpkg --add-architecture arm64
+	elif [ "$ARCH" = "arm64" ]; then
+		dpkg --add-architecture armhf
+	fi
+	apt-get update
+	apt-get dist-upgrade -y
 EOF

stage0/02-firmware/02-run.sh

@@ -1,3 +1,10 @@
 #!/bin/bash -e
 
-sed -i 's/^update_initramfs=.*/update_initramfs=no/' "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf"
+if [ -f "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf" ]; then
+	sed -i 's/^update_initramfs=.*/update_initramfs=no/' "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf"
+fi
+
+if [ ! -f "${ROOTFS_DIR}/etc/kernel-img.conf" ]; then
+	echo "do_symlinks=0" > "${ROOTFS_DIR}/etc/kernel-img.conf"
+fi
+rm -f "${ROOTFS_DIR}/"{vmlinuz,initrd.img}*

stage3/00-install-packages/00-packages

@@ -17,3 +17,4 @@ libcamera-apps
 python3-picamera2
 python3-pyqt5
 python3-opengl
+vulkan-tools mesa-vulkan-drivers