From 79627bbb79aeb8892d0389a416c3f1fc86c6c918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Fri, 13 Dec 2024 17:44:46 +0000 Subject: [PATCH] Add support for arm64+tegra-jetson flavor. (LP: #2091392) --- debian/changelog | 6 ++++++ live-build/auto/config | 10 +++++++++- .../ubuntu-server/hooks/03-kernel-metapkg.chroot_early | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 09536e68..ad6a1cba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.765.54) jammy; urgency=medium + + * Add support for arm64+tegra-jetson flavor. (LP: #2091392) + + -- Remy Martin Fri, 06 Dec 2024 17:53:30 +0000 + livecd-rootfs (2.765.53) jammy; urgency=medium * live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary: ensure diff --git a/live-build/auto/config b/live-build/auto/config index 06a1f67e..aaf7a198 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -404,6 +404,8 @@ case $IMAGEFORMAT in MODEL=tegra ;; arm64+tegra-igx) MODEL=tegra-igx ;; + arm64+tegra-jetson) + MODEL=tegra-jetson ;; arm64+*) MODEL=pc-arm64 ;; *) @@ -875,6 +877,9 @@ case $PROJECT in arm64+tegra-igx) variants='tegra-igx' ;; + arm64+tegra-jetson) + variants='tegra-jetson' + ;; riscv64*) # However, for RISC-V we only offer one kernel variants='ga' @@ -909,6 +914,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 @@ -1128,7 +1136,7 @@ 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|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" 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 d1015214..c995a29d 100755 --- a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early +++ b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early @@ -18,6 +18,8 @@ case $PASS in kernel_metapkg=linux-nvidia-tegra elif [ "$flavor" = "nvidia-tegra-igx" ]; then kernel_metapkg=linux-nvidia-tegra-igx + elif [ "$flavor" = "nvidia-tegra-jetson" ]; then + kernel_metapkg=linux-nvidia-tegra-jetson else echo "bogus flavor: $flavor" exit 1