From a666bf4110afff99e15f9600bbfe07e62176c77b Mon Sep 17 00:00:00 2001
From: Remy MARTIN <remy.martin@canonical.com>
Date: Tue, 29 Oct 2024 11:56:25 +0100
Subject: [PATCH] Add tegra-jetson subarch,model,variant

The previous Tegra kernel metapackage implementation (linux-nvidia-tegra-igx)
was initially planned to apply both for Jetson devices and IGX systems. It turned
out recently (LP: #2069179) that we now need to reserve the metapackage name
linux-nvidia-tegra-igx for IGX systems, and use the new linux-nvidia-tegra-jetson
metapackage for Jetson devices. For the sake of clarity, the image name, model,
sub-arch, variant should align with the kernel metapackage name.
---
 live-build/auto/config | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/live-build/auto/config b/live-build/auto/config
index 338c8b84..ac920a45 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -4,7 +4,8 @@ set -e
 case $ARCH:$SUBARCH in
 	amd64:|amd64:generic|amd64:intel-iot|\
 	arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|\
-	arm64:tegra|arm64:tegra-igx|arm64:x13s|arm64:largemem|\
+	arm64:tegra|arm64:tegra-igx|arm64:tegra-jetson|arm64:x13s|\
+	arm64:largemem|\
 	armhf:|\
 	i386:|\
 	ppc64el:|\
@@ -394,7 +395,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
 					# All raspi images use ubuntu-image.
 					IMAGEFORMAT=ubuntu-image
 					;;
-				arm64+tegra|arm64+tegra-igx)
+				arm64+tegra|arm64+tegra-igx|arm64+tegra-jetson)
 					# Pre-installed Tegra images use
 					# ubuntu-image
 					IMAGEFORMAT=ubuntu-image
@@ -473,6 +474,8 @@ case $IMAGEFORMAT in
 				MODEL=tegra ;;
 			arm64+tegra-igx)
 				MODEL=tegra-igx ;;
+			arm64+tegra-jetson)
+				MODEL=tegra-jetson ;;
 			arm64+*)
 				MODEL=pc-arm64 ;;
 			*)
@@ -992,6 +995,8 @@ case $PROJECT in
 						;;
 					tegra-igx)
 						variants='tegra-igx'
+					tegra-jetson)
+						variants='tegra-jetson'
 						;;
 					largemem)
 						# variants='ga-64k hwe-64k'
@@ -1025,6 +1030,9 @@ case $PROJECT in
 					elif [ "$variant" = "tegra-igx" ]; then
 						kernel_metapkg=linux-nvidia-tegra-igx
 						flavor=nvidia-tegra-igx
+					elif [ "$variant" = "tegra-jetson" ]; then
+						kernel_metapkg=linux-nvidia-tegra-jetson
+						flavor=nvidia-tegra-jetson
 					else
 						echo "bogus variant: $variant"
 						exit 1
@@ -1264,7 +1272,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
 		add_package install linux-firmware-raspi pi-bluetooth u-boot-rpi u-boot-tools
 		BINARY_REMOVE_LINUX=false
 		;;
-	arm64+tegra|arm64+tegra-igx)
+	arm64+tegra|arm64+tegra-igx|arm64+tegra-jetson)
 		# Common configuration for all NVIDIA Tegra image variants
 		# (server, desktop etc.)
 		KERNEL_FLAVOURS="nvidia-$SUBARCH"