[neon/neon/livecd-rootfs/Neon/release_focal] live-build/ubuntu-server/hooks: Additional changes were needed for the server-live hooks, since those were exiting early for SUBARCH images.

[Łukasz 'sil2100' Zemczak]

Git commit 7410fc4a3e2bff090eb789c03f3967c82ae69778 by Łukasz 'sil2100' Zemczak.
Committed on 10/06/2022 at 14:46.
Pushed by jriddell into branch 'Neon/release_focal'.

Additional changes were needed for the server-live hooks, since those were exiting early for SUBARCH images.

M  +1    -1    live-build/ubuntu-server/hooks/030-root-squashfs.binary
M  +1    -1    live-build/ubuntu-server/hooks/032-installer-squashfs.binary
M  +12   -2    live-build/ubuntu-server/hooks/033-kernel-bits.binary

https://invent.kde.org/neon/neon/livecd-rootfs/commit/7410fc4a3e2bff090eb789c03f3967c82ae69778

diff --git a/live-build/ubuntu-server/hooks/030-root-squashfs.binary b/live-build/ubuntu-server/hooks/030-root-squashfs.binary
index 41c15001..7f1b41c3 100755
--- a/live-build/ubuntu-server/hooks/030-root-squashfs.binary
+++ b/live-build/ubuntu-server/hooks/030-root-squashfs.binary
@@ -15,7 +15,7 @@ case $IMAGE_TARGETS in
 		;;
 esac
 
-if [ -n "$SUBARCH" ]; then
+if [ -n "$SUBARCH" && "$SUBARCH" != "intel-iot" ]; then
 	echo "Skipping rootfs build for subarch flavor build"
 	exit 0
 fi
diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
index 1bddfe87..c4e8d67e 100755
--- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
+++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
@@ -16,7 +16,7 @@ case $IMAGE_TARGETS in
 		;;
 esac
 
-if [ -n "$SUBARCH" ]; then
+if [ -n "$SUBARCH" && "$SUBARCH" != "intel-iot" ]; then
 	echo "Skipping rootfs build for subarch flavor build"
 	exit 0
 fi
diff --git a/live-build/ubuntu-server/hooks/033-kernel-bits.binary b/live-build/ubuntu-server/hooks/033-kernel-bits.binary
index deab79e5..d0968512 100755
--- a/live-build/ubuntu-server/hooks/033-kernel-bits.binary
+++ b/live-build/ubuntu-server/hooks/033-kernel-bits.binary
@@ -14,7 +14,7 @@ case ${IMAGE_TARGETS-} in
 		;;
 esac
 
-if [ -n "${SUBARCH-}" ]; then
+if [ -n "${SUBARCH-}" && "$SUBARCH" != "intel-iot" ]; then
 	echo "Skipping rootfs build for subarch flavor build"
 	exit 0
 fi
@@ -27,7 +27,14 @@ INSTALLER_ROOT=binary/boot/installer.squashfs.dir
 KERNEL_BITS_ROOT=binary/boot/kernel-bits.dir
 KERNEL_BITS_OVERLAY=binary/boot/overlay-kernel-bits
 
-variants='ga hwe'
+case ${SUBARCH-} in
+	intel-iot)
+		variants='intel'
+		;;
+	*)
+		variants='ga hwe'
+		;;
+esac
 
 for variant in $variants; do
 	if [ "$variant" = "ga" ]; then
@@ -36,6 +43,9 @@ for variant in $variants; do
 	elif [ "$variant" = "hwe" ]; then
 		kernel_metapkg=linux-generic-hwe-$(lsb_release -sr)
 		flavor=generic-hwe
+	elif [ "$variant" = "intel" ]; then
+		kernel_metapkg=linux-intel-iotg-edge
+		flavor=intel-iotg
 	else
 		echo "bogus variant: $variant"
 		exit 1