diff -Nru nvidia-tegra-defaults-1.2~22.04/debian/changelog nvidia-tegra-defaults-1.3~22.04.1/debian/changelog --- nvidia-tegra-defaults-1.2~22.04/debian/changelog 2023-09-22 14:18:42.000000000 +0000 +++ nvidia-tegra-defaults-1.3~22.04.1/debian/changelog 2023-10-09 16:51:16.000000000 +0000 @@ -1,8 +1,19 @@ -nvidia-tegra-defaults (1.2~22.04) jammy; urgency=medium +nvidia-tegra-defaults (1.3~22.04.1) jammy; urgency=medium * Backport to jammy; LP: #2037096. - -- Loïc Minier Fri, 22 Sep 2023 14:18:42 +0000 + -- Loïc Minier Mon, 09 Oct 2023 16:51:16 +0000 + +nvidia-tegra-defaults (1.3) mantic; urgency=medium + + * Update GRUB config to set kernel cmdline for both normal and recovery + modes. + * Remove dependency on GRUB. (LP: #2037653) + - Update maintainer scripts to only run update-grub when present. + * Add ttyACM0 as an extra console on the kernel cmdline. + * Use simplefb framebuffer; disable the EFI framebuffer. + + -- Pedro Kopper Thu, 28 Sep 2023 10:55:01 -0300 nvidia-tegra-defaults (1.2) mantic; urgency=medium diff -Nru nvidia-tegra-defaults-1.2~22.04/debian/control nvidia-tegra-defaults-1.3~22.04.1/debian/control --- nvidia-tegra-defaults-1.2~22.04/debian/control 2023-09-18 08:40:56.000000000 +0000 +++ nvidia-tegra-defaults-1.3~22.04.1/debian/control 2023-10-06 15:56:45.000000000 +0000 @@ -8,12 +8,10 @@ Standards-Version: 4.6.0.1 Package: nvidia-tegra-defaults -# target platform is arm64 and the GRUB dependency would only work on that -# arch +# target platform is arm64 Architecture: arm64 Depends: ${misc:Depends}, - grub-efi-arm64 (>= 2.0.0), Description: Configuration files specific to NVIDIA Tegra boards This package provides configuration files useful on NVIDIA embedded boards from the Tegra family. diff -Nru nvidia-tegra-defaults-1.2~22.04/debian/nvidia-tegra-defaults.postinst nvidia-tegra-defaults-1.3~22.04.1/debian/nvidia-tegra-defaults.postinst --- nvidia-tegra-defaults-1.2~22.04/debian/nvidia-tegra-defaults.postinst 2023-09-14 14:32:22.000000000 +0000 +++ nvidia-tegra-defaults-1.3~22.04.1/debian/nvidia-tegra-defaults.postinst 2023-09-28 13:55:01.000000000 +0000 @@ -2,8 +2,8 @@ set -e -if [ "$1" = configure ]; then - update-grub2 +if [ "$1" = configure ] && [ -e /boot/grub/grub.cfg ] && which update-grub >/dev/null 2>&1; then + update-grub || true fi #DEBHELPER# diff -Nru nvidia-tegra-defaults-1.2~22.04/debian/nvidia-tegra-defaults.postrm nvidia-tegra-defaults-1.3~22.04.1/debian/nvidia-tegra-defaults.postrm --- nvidia-tegra-defaults-1.2~22.04/debian/nvidia-tegra-defaults.postrm 2023-09-13 17:32:57.000000000 +0000 +++ nvidia-tegra-defaults-1.3~22.04.1/debian/nvidia-tegra-defaults.postrm 2023-09-28 13:55:01.000000000 +0000 @@ -4,7 +4,9 @@ case "$1" in purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - update-grub2 + if [ -e /boot/grub/grub.cfg ] && which update-grub >/dev/null 2>&1; then + update-grub || true + fi ;; esac diff -Nru nvidia-tegra-defaults-1.2~22.04/files/etc/default/grub.d/99-nvidia-tegra-defaults.cfg nvidia-tegra-defaults-1.3~22.04.1/files/etc/default/grub.d/99-nvidia-tegra-defaults.cfg --- nvidia-tegra-defaults-1.2~22.04/files/etc/default/grub.d/99-nvidia-tegra-defaults.cfg 2023-09-13 17:13:41.000000000 +0000 +++ nvidia-tegra-defaults-1.3~22.04.1/files/etc/default/grub.d/99-nvidia-tegra-defaults.cfg 2023-10-06 15:55:45.000000000 +0000 @@ -1,8 +1,12 @@ # SPDX: GPL-3.0+ # Copyright (C) 2023 Canonical Ltd. -# Adds aditional console output on ttyTCU0 to cmdline -GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT} console=ttyTCU0,115200 console=tty0" +# Use simplefb framebuffer, disabled efifb as in 5.15 the firmware => linux +# handoff doesn't work properly +GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} fbcon=map:0 video=efifb:off" + +# Enable kernel output and systemd gettys on all serial consoles +GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} console=ttyAMA0,115200 console=ttyTCU0,115200 console=tty0" # Enables console mode so that we get a menu on the serial port GRUB_TERMINAL=console