Merge ~xnox/debian-cd:generic-artifact-name into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

[Dimitri John Ledkov]

x13s: Use generic kernel artifact name

[Steve Langasek (vorlon)]

Confirmed that the new x13s image is the only user of the newly-added DTB extraction code here, so it should extract from the squashfs that's relevant on that particular image.

review: Approve

diff --git a/tools/boot/mantic/boot-arm64 b/tools/boot/mantic/boot-arm64
index 7915bbb..4974d4e 100755
--- a/tools/boot/mantic/boot-arm64
+++ b/tools/boot/mantic/boot-arm64
@@ -20,7 +20,9 @@ case "$SUBARCH" in
 	FLAVOUR=nvidia-tegra
 	;;
     x13s)
-	FLAVOUR=laptop
+	# See https://code.launchpad.net/~xnox/livecd-rootfs/+git/livecd-rootfs/+merge/452427
+	#FLAVOUR=laptop
+	FLAVOUR=generic
 	DTB="usr/lib/firmware/*/device-tree/qcom/sc8280xp-lenovo-thinkpad-x13s.dtb"
 	EXTRA_CMDLINE="clk_ignore_unused pd_ignore_unused"
 	;;
@@ -41,7 +43,7 @@ fi
 
 # extract dtb
 if [ -n "$DTB" ]; then
-    unsquashfs -i -d $CDDIR/casper/squashfs-root $CDDIR/casper/minimal.squashfs -e "$DTB"
+    unsquashfs -i -d $CDDIR/casper/squashfs-root $CDDIR/casper/minimal.standard.live.squashfs -e "$DTB"
     mv $CDDIR/casper/squashfs-root/$DTB $CDDIR/casper/
     rm -rf $CDDIR/casper/squashfs-root
     DTB_COMMAND="