Merge branch 'raspi-only-arm64' into ubuntu/master

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (24.04.13) UNRELEASED; urgency=medium
+
+  * Drop support for building armhf+raspi images; as of noble these are
+    arm64-only.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 08 Dec 2023 18:35:20 -0800
+
 livecd-rootfs (24.04.12) noble; urgency=medium
 
   * Switch Edubuntu to the new installer.

live-build/auto/build

@@ -695,7 +695,7 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
 fi
 
 case $SUBARCH in
-	raspi|raspi2)
+	raspi)
 		# copy the kernel and initrd to a predictable directory for
 		# ubuntu-image consumption.  In some cases, like in pi2/3
 		# u-boot, the bootloader needs to contain the kernel and initrd,

live-build/auto/config

@@ -5,7 +5,7 @@ case $ARCH:$SUBARCH in
 	amd64:|amd64:generic|amd64:intel-iot|\
 	arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|\
 	arm64:tegra|arm64:tegra-igx|arm64:x13s|\
-	armhf:|armhf:raspi|\
+	armhf:|\
 	i386:|\
 	ppc64el:|\
 	riscv64:|riscv64:generic|riscv64:icicle|riscv64:licheerv|\
@@ -342,7 +342,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
 	case $PROJECT:${SUBPROJECT:-} in
 		ubuntu-cpc:*|ubuntu:desktop-preinstalled|ubuntu-wsl:*)
 			case $ARCH+${SUBARCH:-} in
-				*+raspi)
+				arm64+raspi)
 					# All raspi images use ubuntu-image.
 					IMAGEFORMAT=ubuntu-image
 					;;
@@ -366,7 +366,6 @@ fi
 # one also must request disk1-img-xz image format
 if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then
 	case $ARCH:$SUBARCH in
-		armhf:raspi2 | \
 		riscv64:icicle | \
 		riscv64:nezha | \
 		riscv64:licheerv | \
@@ -416,18 +415,10 @@ case $IMAGEFORMAT in
 				MODEL=pc-amd64 ;;
 			arm64+snapdragon)
 				MODEL=dragonboard ;;
-			armhf+raspi)
-				MODEL=pi ;;
-			armhf+raspi2)
-				MODEL=pi2 ;;
-			armhf+raspi3)
-				MODEL=pi3 ;;
 			arm64+raspi)
 				MODEL=pi-arm64 ;;
 			arm64+raspi3)
 				MODEL=pi3-arm64 ;;
-			armhf+cm3)
-				MODEL=cm3 ;;
 			arm64+tegra)
 				MODEL=tegra ;;
 			arm64+tegra-igx)
@@ -476,9 +467,6 @@ case $IMAGEFORMAT in
 					else
 						CORE_MAJOR=22
 					fi
-					if [ "${MODEL}" = "pi" ]; then
-						MODEL=pi-armhf
-					fi
 					# Ubuntu Core 2x
 					# Currently uc2x assertions do not support global
 					# channel overrides, instead we have per-channel models
@@ -1053,7 +1041,7 @@ case $PROJECT in
 		BINARY_REMOVE_LINUX=false
 		OPTS="${OPTS:+$OPTS }--initramfs=none"
 		case "$ARCH+${SUBARCH:-}" in
-			*+raspi)
+			arm64+raspi)
 				add_task install ubuntu-server-raspi
 				;;
 			arm64*)
@@ -1192,7 +1180,7 @@ if [ "$PREINSTALLED" != "true" ] && [ "$PASSES_TO_LAYERS" != "true" ] && [ "$LIV
 fi
 
 case "$ARCH${SUBARCH:++$SUBARCH}" in
-	arm*+raspi)
+	arm64+raspi)
 		# Common configuration for all Raspberry Pi image variants (server,
 		# desktop etc.)
 		KERNEL_FLAVOURS="$SUBARCH"
@@ -1329,7 +1317,7 @@ EOF
 esac
 
 case "$ARCH+${SUBARCH:-}" in
-	*+raspi)
+	arm64+raspi)
 		cat > config/hooks/01-firmware-directory.chroot_early <<EOF
 #!/bin/sh -ex
 mkdir -p /boot/firmware

live-build/ubuntu-cpc/hooks.d/base/disk-image.binary

@@ -19,14 +19,6 @@ case $ARCH:$SUBARCH in
 		echo "POWER disk images are handled separately"
 		exit 0
 		;;
-	armhf:raspi2)
-		# matches the size of the snappy image
-		IMAGE_SIZE=$((4*1000*1000*1000))
-
-		BOOTPART_START=8192s
-		BOOTPART_END=138M
-		BOOT_MOUNTPOINT=/boot/firmware
-		;;
 	arm64:*|armhf:*|riscv64:*)
 		echo "We only create EFI images for $ARCH."
 		exit 0
@@ -94,20 +86,6 @@ cp -a chroot/* mountpoint/
 
 setup_mountpoint mountpoint
 
-case $ARCH:$SUBARCH in
-	armhf:raspi2)
-		chroot mountpoint flash-kernel \
-			--machine "Raspberry Pi 2 Model B"
-		# not the best place for this, but neither flash-kernel nor
-		# u-boot have provisions for installing u-boot via maintainer
-		# script
-		${my_d}/raspi2/mkknlimg --dtok \
-			mountpoint/usr/lib/u-boot/rpi_2/u-boot.bin \
-			mountpoint/boot/firmware/uboot.bin
-		;;
-	*)	;;
-esac
-
 case $ARCH in
     amd64|i386) should_install_grub=1;;
              *) should_install_grub=0;;