[neon/neon/livecd-rootfs/Neon/release] /: Add the capability to build an ISO image for the Intel IoT project. Additionally, stop using universe with the project given that the kernel is now in main.

[Brian Murray]

Git commit 8288552dea2f3539fbb10777931c39fe0a8d2921 by Brian Murray.
Committed on 17/11/2021 at 01:17.
Pushed by jriddell into branch 'Neon/release'.

Add the capability to build an ISO image for the Intel IoT project. Additionally, stop using universe with the project given that the kernel is now in main.

M  +8    -0    debian/changelog
M  +3    -0    live-build/auto/build
M  +8    -3    live-build/auto/config

https://invent.kde.org/neon/neon/livecd-rootfs/commit/8288552dea2f3539fbb10777931c39fe0a8d2921

diff --git a/debian/changelog b/debian/changelog
index 59477607..4169b394 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.664.34) focal; urgency=medium
+
+  * Add the capability to build an ISO image for the Intel IoT project.
+    Additionally, stop using universe with the project given that the kernel
+    is now in main. (LP: #1951173)
+
+ -- Brian Murray <brian at ubuntu.com>  Tue, 16 Nov 2021 16:56:36 -0800
+
 livecd-rootfs (2.664.33) focal; urgency=medium
 
   * Install cloud-initramfs-growroot to actually enable rootfs resize.
diff --git a/live-build/auto/build b/live-build/auto/build
index 0ed25a59..213f748f 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -852,6 +852,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 		oem-*)
 			FLAVOUR="oem"
 			;;
+		image-intel)
+			FLAVOUR="intel"
+			;;
 	esac
 	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
 	if [ -z "$KVERS" ]; then
diff --git a/live-build/auto/config b/live-build/auto/config
index 6d5ad897..c499a22b 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -605,7 +605,7 @@ case $PROJECT in
 					# grow the rootfs, manually install cloud-initramfs-growroot during build
 					add_package install cloud-initramfs-growroot
 				    	KERNEL_FLAVOURS='image-intel'
-					COMPONENTS='main restricted universe'
+					COMPONENTS='main restricted'
 					OPTS="${OPTS:+$OPTS }--initramfs=none"
 					OPTS="${OPTS:+$OPTS }--system=normal"
 					OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
@@ -618,6 +618,10 @@ case $PROJECT in
 				add_task install minimal standard ubuntu-desktop
 				add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
 				KERNEL_FLAVOURS='generic-hwe-20.04'
+				if [ "$SUBARCH" = "intel-iot" ]; then
+					KERNEL_FLAVOURS='image-intel'
+					COMPONENTS='main restricted'
+				fi
 				;;
 		esac
 		;;
@@ -841,7 +845,7 @@ case $PROJECT in
 			amd64*)
 				if [ "${SUBARCH:-}" = "intel-iot" ]; then
 					KERNEL_FLAVOURS=image-intel
-					COMPONENTS='main restricted universe'
+					COMPONENTS='main restricted'
 					OPTS="${OPTS:+$OPTS }--initramfs=none"
 				fi
 				;;
@@ -1008,8 +1012,9 @@ case $PROJECT in
 		KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
 		case $SUBARCH in
 			intel-iot)
-				COMPONENTS='main restricted universe'
+				COMPONENTS='main restricted'
 				KERNEL_FLAVOURS='image-intel'
+				;;
 		esac
 		;;
 esac