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

Merge remote-tracking branch 'rmartin013/rename-tegra-igx' into ubuntu/master

Browse Source 
Fix typo in live-build/auto/config
This commit is contained in:
Loïc Minier 2024-11-26 13:49:19 +00:00
commit 9f0bc6a17c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
live-build/auto/config
View File

@ -4,7 +4,8 @@ set -e
case $ARCH:$SUBARCH in case $ARCH:$SUBARCH in
amd64:|amd64:generic|amd64:intel-iot|\ amd64:|amd64:generic|amd64:intel-iot|\
arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|\ 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:|\ armhf:|\
i386:|\ i386:|\
ppc64el:|\ ppc64el:|\
@ -394,7 +395,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
# All raspi images use ubuntu-image. # All raspi images use ubuntu-image.
IMAGEFORMAT=ubuntu-image IMAGEFORMAT=ubuntu-image
;; ;;
arm64+tegra|arm64+tegra-igx) arm64+tegra|arm64+tegra-igx|arm64+tegra-jetson)
# Pre-installed Tegra images use # Pre-installed Tegra images use
# ubuntu-image # ubuntu-image
IMAGEFORMAT=ubuntu-image IMAGEFORMAT=ubuntu-image
@ -473,6 +474,8 @@ case $IMAGEFORMAT in
MODEL=tegra ;; MODEL=tegra ;;
arm64+tegra-igx) arm64+tegra-igx)
MODEL=tegra-igx ;; MODEL=tegra-igx ;;
arm64+tegra-jetson)
MODEL=tegra-jetson ;;
arm64+*) arm64+*)
MODEL=pc-arm64 ;; MODEL=pc-arm64 ;;
*) *)
@ -1024,6 +1027,9 @@ case $PROJECT in
tegra-igx) tegra-igx)
variants='tegra-igx' variants='tegra-igx'
;; ;;
tegra-jetson)
variants='tegra-jetson'
;;
largemem) largemem)
# variants='ga-64k hwe-64k' # variants='ga-64k hwe-64k'
variants='ga-64k' variants='ga-64k'
@ -1056,6 +1062,9 @@ case $PROJECT in
elif [ "$variant" = "tegra-igx" ]; then elif [ "$variant" = "tegra-igx" ]; then
kernel_metapkg=linux-nvidia-tegra-igx kernel_metapkg=linux-nvidia-tegra-igx
flavor=nvidia-tegra-igx flavor=nvidia-tegra-igx
elif [ "$variant" = "tegra-jetson" ]; then
kernel_metapkg=linux-nvidia-tegra-jetson
flavor=nvidia-tegra-jetson
else else
echo "bogus variant: $variant" echo "bogus variant: $variant"
exit 1 exit 1
@ -1295,7 +1304,7 @@ 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|arm64+tegra-igx) arm64+tegra|arm64+tegra-igx|arm64+tegra-jetson)
# Common configuration for all NVIDIA Tegra image variants # Common configuration for all NVIDIA Tegra image variants
# (server, desktop etc.) # (server, desktop etc.)
KERNEL_FLAVOURS="nvidia-$SUBARCH" KERNEL_FLAVOURS="nvidia-$SUBARCH"