[neon/neon/livecd-rootfs/Neon/release_jammy] live-build: Add support for tegra-igx (similar to tegra)

[Remy MARTIN]

Git commit a692ec854932593104dfbdbbf008593774cf3f81 by Remy MARTIN, on behalf of Loïc Minier.
Committed on 21/05/2024 at 16:36.
Pushed by carlosdem into branch 'Neon/release_jammy'.

Add support for tegra-igx (similar to tegra)

M  +13   -3    live-build/auto/config
M  +2    -0    live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early

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

diff --git a/live-build/auto/config b/live-build/auto/config
index 58990208..8e89ee71 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -400,6 +400,10 @@ case $IMAGEFORMAT in
 				MODEL=pi3-arm64 ;;
 			armhf+cm3)
 				MODEL=cm3 ;;
+			arm64+tegra)
+				MODEL=tegra ;;
+			arm64+tegra-igx)
+				MODEL=tegra-igx ;;
 			arm64+*)
 				MODEL=pc-arm64 ;;
 			*)
@@ -863,6 +867,9 @@ case $PROJECT in
 					arm64+tegra)
 						variants='tegra'
 						;;
+					arm64+tegra-igx)
+						variants='tegra-igx'
+						;;
 					riscv64*)
 						# However, for RISC-V we only offer one kernel
 						variants='ga'
@@ -894,6 +901,9 @@ case $PROJECT in
 					elif [ "$variant" = "tegra" ]; then
 						kernel_metapkg=linux-nvidia-tegra
 						flavor=nvidia-tegra
+					elif [ "$variant" = "tegra-igx" ]; then
+						kernel_metapkg=linux-nvidia-tegra-igx
+						flavor=nvidia-tegra-igx
 					else
 						echo "bogus variant: $variant"
 						exit 1
@@ -1113,9 +1123,9 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
 		add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi u-boot-tools
 		BINARY_REMOVE_LINUX=false
 		;;
-	arm64+tegra)
-		# Common configuration for all NVIDIA Tegra image variants (server,
-		# desktop etc.)
+	arm64+tegra|arm64+tegra-igx)
+		# Common configuration for all NVIDIA Tegra image variants
+		# (server, desktop etc.)
 		KERNEL_FLAVOURS="nvidia-$SUBARCH"
 		COMPONENTS='main restricted universe multiverse'
 		;;
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 177ce8c1..d1015214 100755
--- a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
+++ b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
@@ -16,6 +16,8 @@ case $PASS in
             kernel_metapkg=linux-intel-iotg
         elif [ "$flavor" = "nvidia-tegra" ]; then
             kernel_metapkg=linux-nvidia-tegra
+        elif [ "$flavor" = "nvidia-tegra-igx" ]; then
+            kernel_metapkg=linux-nvidia-tegra-igx
         else
             echo "bogus flavor: $flavor"
             exit 1