From 48dd1043b2ec10242feb2838e45c3b20e551db30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@canonical.com>
Date: Thu, 28 Jul 2022 20:12:44 +0200
Subject: [PATCH] Forward-port sever-live additions for intel-iotg

---
 live-build/auto/config                            | 15 ++++++++++++---
 .../hooks/03-kernel-metapkg.chroot_early          |  2 ++
 .../ubuntu-server/hooks/04-kernel-bits.binary     |  2 ++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/live-build/auto/config b/live-build/auto/config
index b594b79c..05d883e8 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -848,9 +848,15 @@ case $PROJECT in
 				# the GA and HWE kernels (in separate layers) so this code is
 				# written generically to support both even though a lot of the
 				# time only one kernel is offered.
-
-				# variants='ga hwe'
-				variants='ga'
+				case ${SUBARCH-} in
+					intel-iot)
+						variants='intel'
+						;;
+					*)
+						# variants='ga hwe'
+						variants='ga'
+						;;
+				esac
 
 				for variant in $variants; do
 					if [ "$variant" = "ga" ]; then
@@ -859,6 +865,9 @@ case $PROJECT in
 					elif [ "$variant" = "hwe" ]; then
 						kernel_metapkg=linux-generic-hwe-$(lsb_release -sr)
 						flavor=generic-hwe
+					elif [ "$variant" = "intel" ]; then
+						kernel_metapkg=linux-intel-iotg
+						flavor=intel-iotg
 					else
 						echo "bogus variant: $variant"
 						exit 1
diff --git a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
index 864d4c4c..62636447 100755
--- a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
+++ b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
@@ -8,6 +8,8 @@ case $PASS in
             kernel_metapkg=linux-generic
         elif [ "$flavor" = "generic-hwe" ]; then
             kernel_metapkg=linux-generic-hwe-$(lsb_release -sr)
+        elif [ "$flavor" = "intel" ]; then
+            kernel_metapkg=linux-intel-iotg
         else
             echo "bogus flavor: $flavor"
             exit 1
diff --git a/live-build/ubuntu-server/hooks/04-kernel-bits.binary b/live-build/ubuntu-server/hooks/04-kernel-bits.binary
index c0b2e3d7..51520265 100755
--- a/live-build/ubuntu-server/hooks/04-kernel-bits.binary
+++ b/live-build/ubuntu-server/hooks/04-kernel-bits.binary
@@ -10,6 +10,8 @@ case $PASS in
         ;;
 esac
 
+PROJECT=$PROJECT${SUBARCH:+-$SUBARCH}
+
 # Fish out generated kernel image and initrd
 mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-$flavor
 mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-$flavor