From f394ee08a758eda028d0ea96faf13b3a72aad8f1 Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Tue, 3 Oct 2023 03:54:06 +0000
Subject: [PATCH] Imported 23.10.51 from mantic-release pocket.

No reason for CPC update specified.
---
 debian/changelog                              |  9 ++++++
 live-build/auto/config                        |  2 +-
 live-build/lb_chroot_layered                  |  9 +++++-
 .../ubuntu/hooks/020-ubuntu-live.binary       | 28 -------------------
 4 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100755 live-build/ubuntu/hooks/020-ubuntu-live.binary

diff --git a/debian/changelog b/debian/changelog
index d8cc3949..120bcd85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (23.10.51) mantic; urgency=medium
+
+  [ Dimitri John Ledkov ]
+  * Add support to live-build/lb_chroot_layered to allow adding the kernel to
+    the currently required layer location, which fixes arm64+x13s and also
+    allows for removing live-build/ubuntu/hooks/020-ubuntu-live.binary.
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Mon, 02 Oct 2023 14:55:29 -0600
+
 livecd-rootfs (23.10.50) mantic; urgency=medium
 
   * live-build/ubuntu/hooks: ensure kernel artifacts named with subarch
diff --git a/live-build/auto/config b/live-build/auto/config
index f90611d7..c528e36d 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1223,7 +1223,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
 esac
 
 case $PROJECT:${SUBPROJECT:-} in
-	ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*|ubuntu:)
+	ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*)
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
 		KERNEL_FLAVOURS=none
 		BINARY_REMOVE_LINUX=false
diff --git a/live-build/lb_chroot_layered b/live-build/lb_chroot_layered
index a48dce71..828517ce 100755
--- a/live-build/lb_chroot_layered
+++ b/live-build/lb_chroot_layered
@@ -167,7 +167,6 @@ create_chroot_pass () {
 	fi
 
 	# Customizing chroot
-	lb chroot_linux-image ${*}
 	lb chroot_preseed ${*}
 	lb chroot_early_hooks ${*}
 
@@ -205,7 +204,15 @@ create_chroot_pass () {
 	# Add live packages to live layers
 	for livepass in $LIVE_PASSES; do
 		[ "$livepass" != "$pass" ] && continue
+		lb chroot_linux-image ${*}
 		lb chroot_live-packages ${*}
+		if [ "$LB_LINUX_PACKAGES" = "linux" ]; then
+		    for flavour in $LB_LINUX_FLAVOURS; do
+			mkdir -p chroot/etc/subiquity
+			echo "linux-$flavour" > chroot/etc/subiquity/kernel-meta-package
+			break
+		    done
+		fi
 		break
 	done
 
diff --git a/live-build/ubuntu/hooks/020-ubuntu-live.binary b/live-build/ubuntu/hooks/020-ubuntu-live.binary
deleted file mode 100755
index 7f44aad8..00000000
--- a/live-build/ubuntu/hooks/020-ubuntu-live.binary
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /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
-    minimal.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
-
-PROJECT=$PROJECT${SUBARCH:+-$SUBARCH}
-
-mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-generic
-mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-generic
-chmod a+r ${PWD}/livecd.${PROJECT}.initrd-generic ${PWD}/livecd.${PROJECT}.kernel-generic