mirror of
				https://git.launchpad.net/livecd-rootfs
				synced 2025-11-03 18:34:11 +00:00 
			
		
		
		
	Allow to chose nvidia kernel instead of generic
This commit is contained in:
		
							parent
							
								
									08be218c82
								
							
						
					
					
						commit
						208d53affc
					
				
							
								
								
									
										6
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							@ -1,3 +1,9 @@
 | 
			
		||||
livecd-rootfs (25.10.8) questing; urgency=medium
 | 
			
		||||
 | 
			
		||||
  * desktop and server: read the subarch to allow the usage nvidia's kernel instead of generic
 | 
			
		||||
 | 
			
		||||
 -- Antoine Lassagne <antoine.lassagne@canonical.com>  Fri, 13 Jun 2025 09:31:00 +0200
 | 
			
		||||
 | 
			
		||||
livecd-rootfs (25.10.7) questing; urgency=medium
 | 
			
		||||
 | 
			
		||||
  * revert 25.10.6 due to duplicated snaps
 | 
			
		||||
 | 
			
		||||
@ -484,6 +484,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 | 
			
		||||
		lowlatency-hwe-*)
 | 
			
		||||
			FLAVOUR="lowlatency"
 | 
			
		||||
			;;
 | 
			
		||||
		nvidia-hwe-*)
 | 
			
		||||
			FLAVOUR="nvidia"
 | 
			
		||||
			;;
 | 
			
		||||
	esac
 | 
			
		||||
	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
 | 
			
		||||
	if [ -z "$KVERS" ]; then
 | 
			
		||||
 | 
			
		||||
@ -3,7 +3,7 @@ set -e
 | 
			
		||||
 | 
			
		||||
case $ARCH:$SUBARCH in
 | 
			
		||||
	amd64:|amd64:generic|amd64:intel-iot|\
 | 
			
		||||
	arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|\
 | 
			
		||||
	arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|arm64:nvidia|\
 | 
			
		||||
	arm64:tegra|arm64:tegra-igx|arm64:tegra-jetson|arm64:x13s|\
 | 
			
		||||
	arm64:largemem|\
 | 
			
		||||
	armhf:|\
 | 
			
		||||
@ -844,6 +844,16 @@ case $PROJECT in
 | 
			
		||||
				HAS_DEFAULT_LANGUAGES=yes
 | 
			
		||||
				LANGUAGE_BASE=desktop
 | 
			
		||||
				KERNEL_FLAVOURS='generic-hwe-24.04'
 | 
			
		||||
 | 
			
		||||
				case $SUBARCH in
 | 
			
		||||
					nvidia)
 | 
			
		||||
						KERNEL_FLAVOURS="nvidia-hwe-24.04"
 | 
			
		||||
						;;
 | 
			
		||||
					*)
 | 
			
		||||
						# nothing to do here.
 | 
			
		||||
						;;
 | 
			
		||||
				esac
 | 
			
		||||
				
 | 
			
		||||
				do_layered_desktop_image
 | 
			
		||||
 | 
			
		||||
				# Enchanced secureboot stuff
 | 
			
		||||
@ -1023,6 +1033,9 @@ case $PROJECT in
 | 
			
		||||
						# variants='ga-64k hwe-64k'
 | 
			
		||||
						variants='ga-64k'
 | 
			
		||||
						;;
 | 
			
		||||
					nvidia)
 | 
			
		||||
						variants='nvidia'
 | 
			
		||||
						;;
 | 
			
		||||
					*)
 | 
			
		||||
						# variants='ga hwe'
 | 
			
		||||
						variants='ga'
 | 
			
		||||
@ -1060,6 +1073,9 @@ case $PROJECT in
 | 
			
		||||
					elif [ "$variant" = "tegra-jetson" ]; then
 | 
			
		||||
						kernel_metapkg=linux-nvidia-tegra-jetson
 | 
			
		||||
						flavor=nvidia-tegra-jetson
 | 
			
		||||
					elif [ "$variant" = "nvidia" ]; then
 | 
			
		||||
						kernel_metapkg=linux-nvidia-hwe-$(lsb_release -sr)
 | 
			
		||||
						flavor=nvidia
 | 
			
		||||
					else
 | 
			
		||||
						echo "bogus variant: $variant"
 | 
			
		||||
						exit 1
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user