From 35fef6becf2df80ee8fb703193f04bfa101115fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@ubuntu.com>
Date: Sat, 8 Apr 2023 18:23:38 +0000
Subject: [PATCH] Initial support for NVIDIA Tegra

live-build/auto/config:
- for Ubuntu Server live images and the arm64+tegra full arch, build a
  tegra variant with linux-nvidia-tegra as the flavor and
  linux-nvidia-tegra as the kernel meta-package
- default to nvidia-$SUBARCH as the kernel flavor and enable all
  components for all images using arm64+tegra as full arch

hooks/03-kernel-metapkg.chroot_early:
- use linux-nvidia-tegra as kernel meta-package for the nvidia-tegra
  flavor
---
 live-build/auto/config                               | 12 ++++++++++++
 .../hooks/03-kernel-metapkg.chroot_early             |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/live-build/auto/config b/live-build/auto/config
index c076521a..1750fa04 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -859,6 +859,9 @@ case $PROJECT in
 					amd64+intel-iot)
 						variants='intel'
 						;;
+					arm64+tegra)
+						variants='tegra'
+						;;
 					riscv64*)
 						# However, for RISC-V we only offer one kernel
 						variants='ga'
@@ -878,6 +881,9 @@ case $PROJECT in
 					elif [ "$variant" = "intel" ]; then
 						kernel_metapkg=linux-intel-iotg
 						flavor=intel-iotg
+					elif [ "$variant" = "tegra" ]; then
+						kernel_metapkg=linux-nvidia-tegra
+						flavor=nvidia-tegra
 					else
 						echo "bogus variant: $variant"
 						exit 1
@@ -1097,6 +1103,12 @@ 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.)
+		KERNEL_FLAVOURS="nvidia-$SUBARCH"
+		COMPONENTS='main restricted universe multiverse'
+		;;
 	riscv*+*)
 		# We'll add wpasupplicant to the seeds when we work on RISC-V seeds.
 		add_package install wpasupplicant
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 3e0be41b..4acbe473 100755
--- a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
+++ b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
@@ -10,6 +10,8 @@ case $PASS in
             kernel_metapkg=linux-generic-hwe-$(lsb_release -sr)
         elif [ "$flavor" = "intel-iotg" ]; then
             kernel_metapkg=linux-intel-iotg
+        elif [ "$flavor" = "nvidia-tegra" ]; then
+            kernel_metapkg=linux-nvidia-tegra
         else
             echo "bogus flavor: $flavor"
             exit 1