diff -Nru livecd-rootfs-2.765.21/debian/changelog livecd-rootfs-2.765.23/debian/changelog --- livecd-rootfs-2.765.21/debian/changelog 2023-04-10 15:05:35.000000000 +0000 +++ livecd-rootfs-2.765.23/debian/changelog 2023-05-23 14:40:34.000000000 +0000 @@ -1,7 +1,25 @@ +livecd-rootfs (2.765.23) jammy; urgency=medium + + [ Loïc Minier ] + * Initial support for NVIDIA Tegra (LP: #2015644). + + -- Łukasz 'sil2100' Zemczak Tue, 23 May 2023 16:40:34 +0200 + +livecd-rootfs (2.765.22) jammy; urgency=medium + + * Drop use of --removable flag to grub-install from + live-build/buildd/hooks/02-disk-image-uefi.binary, to match the cloud + images (7c760864fdcb278ca37396f06f5e3f297428d63d). This fixes + bootloader updates in the buildd images, but also fixes compatibility + with using devtmpfs for losetup. + + -- Steve Langasek Thu, 18 May 2023 15:19:38 -0700 + livecd-rootfs (2.765.21) jammy; urgency=medium [ jchittum ] - * add multiple kernel apparmor feature sets for snap preseeding (LP: 2015596). + * add multiple kernel apparmor feature sets for snap preseeding + (LP: #2015596). -- Steve Langasek Mon, 10 Apr 2023 08:05:35 -0700 diff -Nru livecd-rootfs-2.765.21/live-build/auto/config livecd-rootfs-2.765.23/live-build/auto/config --- livecd-rootfs-2.765.21/live-build/auto/config 2023-04-10 15:05:13.000000000 +0000 +++ livecd-rootfs-2.765.23/live-build/auto/config 2023-05-23 14:40:15.000000000 +0000 @@ -859,6 +859,9 @@ 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 @@ 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 @@ 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 -Nru livecd-rootfs-2.765.21/live-build/buildd/hooks/02-disk-image-uefi.binary livecd-rootfs-2.765.23/live-build/buildd/hooks/02-disk-image-uefi.binary --- livecd-rootfs-2.765.21/live-build/buildd/hooks/02-disk-image-uefi.binary 2023-02-01 15:42:54.000000000 +0000 +++ livecd-rootfs-2.765.23/live-build/buildd/hooks/02-disk-image-uefi.binary 2023-05-23 14:40:15.000000000 +0000 @@ -102,19 +102,9 @@ --boot-directory=/boot \ --efi-directory=/boot/efi \ --target=${efi_target} \ - --removable \ --uefi-secure-boot \ --no-nvram - if [ -f mountpoint/boot/efi/EFI/BOOT/grub.cfg ]; then - sed -i "s| root| root hd0,gpt1|" mountpoint/boot/efi/EFI/BOOT/grub.cfg - sed -i "1i${IMAGE_STR}" mountpoint/boot/efi/EFI/BOOT/grub.cfg - # For some reason the grub disk is looking for /boot/grub/grub.cfg on - # part 15.... - chroot mountpoint mkdir -p /boot/efi/boot/grub - chroot mountpoint cp /boot/efi/EFI/BOOT/grub.cfg /boot/efi/boot/grub - fi - if [ "$ARCH" = "amd64" ]; then # Install the BIOS/GPT bits. Since GPT boots from the ESP partition, # it means that we just run this simple command and we're done diff -Nru livecd-rootfs-2.765.21/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early livecd-rootfs-2.765.23/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early --- livecd-rootfs-2.765.21/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early 2023-04-10 15:05:13.000000000 +0000 +++ livecd-rootfs-2.765.23/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early 2023-05-23 14:40:15.000000000 +0000 @@ -10,6 +10,8 @@ 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