Merge remote-tracking branch 'lool/add-tegra-liver-server' into ubuntu/master

losetup-not-kpartx
Steve Langasek 2 years ago
commit 4112488a44

7
debian/changelog vendored

@ -1,3 +1,10 @@
livecd-rootfs (2.829) UNRELEASED; urgency=medium
[ Loïc Minier ]
* Initial support for NVIDIA Tegra. LP: #2015644.
-- Steve Langasek <steve.langasek@ubuntu.com> Fri, 14 Apr 2023 16:44:32 -0700
livecd-rootfs (2.828) lunar; urgency=medium livecd-rootfs (2.828) lunar; urgency=medium
* 099-ubuntu-image-customization.chroot: Remove redundant creation of oem * 099-ubuntu-image-customization.chroot: Remove redundant creation of oem

@ -975,6 +975,9 @@ case $PROJECT in
intel-iot) intel-iot)
variants='intel' variants='intel'
;; ;;
tegra)
variants='tegra'
;;
*) *)
# variants='ga hwe' # variants='ga hwe'
variants='ga' variants='ga'
@ -991,6 +994,9 @@ case $PROJECT in
elif [ "$variant" = "intel" ]; then elif [ "$variant" = "intel" ]; then
kernel_metapkg=linux-intel-iotg kernel_metapkg=linux-intel-iotg
flavor=intel-iotg flavor=intel-iotg
elif [ "$variant" = "tegra" ]; then
kernel_metapkg=linux-nvidia-tegra
flavor=nvidia-tegra
else else
echo "bogus variant: $variant" echo "bogus variant: $variant"
exit 1 exit 1
@ -1243,6 +1249,11 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
add_package install linux-firmware-raspi pi-bluetooth u-boot-rpi u-boot-tools add_package install linux-firmware-raspi pi-bluetooth u-boot-rpi u-boot-tools
BINARY_REMOVE_LINUX=false BINARY_REMOVE_LINUX=false
;; ;;
arm64+tegra)
# Common configuration for all NVIDIA Tegra image variants (server,
# desktop etc.)
KERNEL_FLAVOURS="nvidia-$SUBARCH"
;;
riscv*+*) riscv*+*)
if [ "${SUBARCH:-}" = "licheerv" ]; then if [ "${SUBARCH:-}" = "licheerv" ]; then
# The wifi driver of the licheerv is an out-of-tree driver packaged # The wifi driver of the licheerv is an out-of-tree driver packaged

@ -13,6 +13,8 @@ case $PASS in
kernel_metapkg=linux-generic-hwe-$(lsb_release -sr) kernel_metapkg=linux-generic-hwe-$(lsb_release -sr)
elif [ "$flavor" = "intel-iotg" ]; then elif [ "$flavor" = "intel-iotg" ]; then
kernel_metapkg=linux-intel-iotg kernel_metapkg=linux-intel-iotg
elif [ "$flavor" = "nvidia-tegra" ]; then
kernel_metapkg=linux-nvidia-tegra
else else
echo "bogus flavor: $flavor" echo "bogus flavor: $flavor"
exit 1 exit 1

Loading…
Cancel
Save