Imported 23.10.34 from mantic-release pocket.

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,23 @@
+livecd-rootfs (23.10.34) mantic; urgency=medium
+
+  [ Steve Langasek ]
+  * Drop (outdated, inconsistent) /etc/hosts from ubuntu-server chroot
+    includes.
+
+  [ Michael Hudson-Doyle ]
+  * auto/config: use the new server-live task to reduce the use of explicit
+    calls to add_package and add_snap a bit.
+
+  [ Dave Jones ]
+  * clean up references to obsolete pi subarchs no longer built, and remove
+    code that writes out /boot/firmware settings that are later clobbered
+
+  [ Dan Bungert ]
+  * desktop: adjust kernel to be in the live layer, to support changing which
+    kernel is installed rather than always using hwe. (LP: #2026225)
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Fri, 08 Sep 2023 08:54:13 -0600
+
 livecd-rootfs (23.10.33) mantic; urgency=medium
 
   * Drop references to kubuntu-plasma5, obsolete since wily

live-build/auto/config

@@ -716,7 +716,6 @@ case $PROJECT in
 			*)
 				touch config/universe-enabled
 				PASSES_TO_LAYERS="true"
-				KERNEL_FLAVOURS='generic-hwe-22.04'
 				# the standard layer, contains all base common packages for later layers
 				add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
 				add_package standard cloud-init
@@ -724,6 +723,7 @@ case $PROJECT in
 				add_task standard.live ubuntu-live
 				remove_package standard.live ubiquity-frontend-gtk
 				add_snap standard.live ubuntu-desktop-installer/classic
+				add_package standard.live linux-generic-hwe-22.04 casper
 				# the enhanced-secureboot layer, contains all packages for the enhanced secureboot install
 				add_package standard.enhanced-secureboot cryptsetup boot-managed-by-snapd
 
@@ -879,11 +879,7 @@ case $PROJECT in
 				add_task ubuntu-server-minimal.ubuntu-server minimal standard server
 				add_package ubuntu-server-minimal.ubuntu-server cloud-init
 
-				add_package ubuntu-server-minimal.ubuntu-server.installer linux-firmware casper openssh-server
+				add_task ubuntu-server-minimal.ubuntu-server.installer server-live
-				add_snap ubuntu-server-minimal.ubuntu-server.installer subiquity/classic
-				if [ $ARCH = s390x ]; then
-					add_package ubuntu-server-minimal.ubuntu-server.installer s390-tools-zkey
-				fi
 
 				# Live server ISOs for LTS point releases past .2 offer both
 				# the GA and HWE kernels (in separate layers) so this code is
@@ -1187,7 +1183,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
 esac
 
 case $PROJECT:${SUBPROJECT:-} in
-	ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*)
+	ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*|ubuntu:)
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
 		KERNEL_FLAVOURS=none
 		BINARY_REMOVE_LINUX=false
@@ -1284,74 +1280,16 @@ EOF
     ;;
 esac
 
-case $ARCH+$SUBARCH in
+case "$ARCH+${SUBARCH:-}" in
-	armhf+raspi2|armhf+raspi|arm64+raspi)
+	*+raspi)
 		cat > config/hooks/01-firmware-directory.chroot_early <<EOF
 #!/bin/sh -ex
 mkdir -p /boot/firmware
 EOF
-		cat > config/hooks/999-raspi2-fixes.chroot <<EOF
+		cat > config/hooks/999-raspi-fixes.chroot <<EOF
 #!/bin/sh -ex
 cat >> /etc/fstab << EOM
 LABEL=system-boot       /boot/firmware  vfat    defaults        0       1
-EOM
-
-cat > /boot/firmware/cmdline.txt << EOM
-net.ifnames=0 dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline rootwait
-EOM
-
-cat > /boot/firmware/config.txt << EOM
-# For more options and information see 
-# http://www.raspberrypi.org/documentation/configuration/config-txt.md
-# Some settings may impact device functionality. See link above for details
-
-kernel=uboot.bin
-device_tree_address=0x02000000
-
-# enable i2c
-dtparam=i2c_arm=on
-dtparam=spi=on
-
-# uncomment if you get no picture on HDMI for a default "safe" mode
-#hdmi_safe=1
-
-# uncomment this if your display has a black border of unused pixels visible
-# and your display can output without overscan
-#disable_overscan=1
-
-# uncomment the following to adjust overscan. Use positive numbers if console
-# goes off screen, and negative if there is too much border
-#overscan_left=16
-#overscan_right=16
-#overscan_top=16
-#overscan_bottom=16
-
-# uncomment to force a console size. By default it will be display's size minus
-# overscan.
-#framebuffer_width=1280
-#framebuffer_height=720
-
-# uncomment if hdmi display is not detected and composite is being output
-#hdmi_force_hotplug=1
-
-# uncomment to force a specific HDMI mode (this will force VGA)
-#hdmi_group=1
-#hdmi_mode=1
-
-# uncomment to force a HDMI mode rather than DVI. This can make audio work in
-# DMT (computer monitor) modes
-#hdmi_drive=2
-
-# uncomment to increase signal to HDMI, if you have interference, blanking, or
-# no display
-#config_hdmi_boost=4
-
-# uncomment for composite PAL
-#sdtv_mode=2
-
-#uncomment to overclock the arm. 700 MHz is the default.
-#arm_freq=800
-
 EOM
 EOF
 		;;

live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal/etc/hosts

@@ -1,9 +0,0 @@
-127.0.0.1	localhost.localdomain	localhost
-::1		localhost6.localdomain6	localhost6
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts

live-build/ubuntu/hooks/020-ubuntu-live.binary

@@ -0,0 +1,26 @@
+#! /bin/sh
+
+# Kernels are deliberately installed into the live layer for Subiquity
+# installers. This provides the ability to select a different kernel later, a
+# key function for OEM support and a general capability for Subiquity.
+
+set -eux
+
+case ${PASS:-} in
+    standard.live)
+        ;;
+    *)
+        exit 0
+        ;;
+esac
+
+if [ -n "${SUBPROJECT:-}" ]; then
+    echo "We don't run Ubuntu Desktop hooks for this project."
+fi
+
+. config/binary
+. config/functions
+
+mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-generic-hwe
+mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-generic-hwe
+chmod a+r ${PWD}/livecd.${PROJECT}.initrd-generic-hwe ${PWD}/livecd.${PROJECT}.kernel-generic-hwe