diff --git a/debian/changelog b/debian/changelog index 4281c747..032f195c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (24.04.82) noble; urgency=medium + + * Add support for arm64+tegra-jetson flavor. (LP: #2091392) + + -- Remy Martin Fri, 13 Dec 2024 11:53:08 +0100 + livecd-rootfs (24.04.81) noble; urgency=medium * Introduce unminimize as a package in OCI images. (LP: #2078583) diff --git a/live-build/auto/config b/live-build/auto/config index 1c0234f6..a827fd33 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:|\ @@ -372,7 +373,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 @@ -451,6 +452,8 @@ case $IMAGEFORMAT in MODEL=tegra ;; arm64+tegra-igx) MODEL=tegra-igx ;; + arm64+tegra-jetson) + MODEL=tegra-jetson ;; arm64+*) MODEL=pc-arm64 ;; *) @@ -983,6 +986,9 @@ case $PROJECT in tegra-igx) variants='tegra-igx' ;; + tegra-jetson) + variants='tegra-jetson' + ;; largemem) # variants='ga-64k hwe-64k' variants='ga-64k' @@ -1015,6 +1021,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 @@ -1257,7 +1266,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" 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 e8e3a796..7bac9211 100755 --- a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early +++ b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early @@ -21,6 +21,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