mirror of
				https://github.com/lingble/meta-tegra.git
				synced 2025-11-03 22:07:50 +00:00 
			
		
		
		
	image_types_tegra: use initramfs link name for tegra_kernel_image
This change leverages the INITRAMFS_LINK_NAME to 'dynamically' build
the image name returned from tegra_kernel_image method during tegra_flash
building.
This helps avoid build failures if a custom INITRAMFS_LINK_NAME is used
to generate a bundled kernel and ramdisk image.
By default, INITRAMFS_LINK_NAME expands to
INITRAMFS_LINK_NAME ?= "initramfs-${KERNEL_ARTIFACT_LINK_NAME}"
which would yield:
KERNEL_ARTIFACT_LINK_NAME ?= "${MACHINE}"
resulting in no change to default behavior.
Signed-off-by: Kevin Vanden Berge <kvandenberge@gmail.com>
			
			
This commit is contained in:
		
				
					committed by
					
						
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							b321300bfc
						
					
				
				
					commit
					934bbc090f
				
			@@ -44,7 +44,7 @@ def tegra_kernel_image(d):
 | 
				
			|||||||
        return '${DEPLOY_DIR_IMAGE}/${IMAGE_UBOOT}-${MACHINE}.bin'
 | 
					        return '${DEPLOY_DIR_IMAGE}/${IMAGE_UBOOT}-${MACHINE}.bin'
 | 
				
			||||||
    if d.getVar('INITRAMFS_IMAGE'):
 | 
					    if d.getVar('INITRAMFS_IMAGE'):
 | 
				
			||||||
        if bb.utils.to_boolean(d.getVar('INITRAMFS_IMAGE_BUNDLE')):
 | 
					        if bb.utils.to_boolean(d.getVar('INITRAMFS_IMAGE_BUNDLE')):
 | 
				
			||||||
            img = '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.cboot'
 | 
					            img = '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-{INITRAMFS_LINK_NAME}.cboot'
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
            img = '${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cboot'
 | 
					            img = '${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cboot'
 | 
				
			||||||
        return img
 | 
					        return img
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user