Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-31 20:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jammy-add-tegra-live-server' of git+ssh://git.launchpad.net/~lool/livecd-rootfs/+git/jammy-add-tegra-live-server into ubuntu/jammy

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2023-05-23 16:37:15 +02:00
commit 32d9a1b82e
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
live-build/auto/config
View File

@ -859,6 +859,9 @@ case $PROJECT in
amd64+intel-iot) amd64+intel-iot)
variants='intel' variants='intel'
;; ;;
arm64+tegra)
variants='tegra'
;;
riscv64*) riscv64*)
# However, for RISC-V we only offer one kernel # However, for RISC-V we only offer one kernel
variants='ga' variants='ga'
@ -878,6 +881,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
@ -1097,6 +1103,12 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi u-boot-tools add_package install linux-firmware-raspi2 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"
COMPONENTS='main restricted universe multiverse'
;;
riscv*+*) riscv*+*)
# We'll add wpasupplicant to the seeds when we work on RISC-V seeds. # We'll add wpasupplicant to the seeds when we work on RISC-V seeds.
add_package install wpasupplicant add_package install wpasupplicant

2
live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
View File

@ -10,6 +10,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