From 5493bb5ba4b4520f944d38b214a3d53a5282e0be Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Wed, 28 Feb 2018 18:15:03 -0800 Subject: live-vm-common.bbclass: Don't use vmlinuz or VM_DEFAULT_KERNEL I can't find VM_DEFAULT_KERNEL used anywhere else, and we should not be statically installing the kernel as vmlinuz. Signed-off-by: California Sullivan Signed-off-by: Richard Purdie --- meta/classes/live-vm-common.bbclass | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'meta/classes/live-vm-common.bbclass') diff --git a/meta/classes/live-vm-common.bbclass b/meta/classes/live-vm-common.bbclass index e1d8b1843b..714d6d4788 100644 --- a/meta/classes/live-vm-common.bbclass +++ b/meta/classes/live-vm-common.bbclass @@ -33,18 +33,17 @@ inherit ${EFI_CLASS} inherit ${PCBIOS_CLASS} KERNEL_IMAGETYPE ??= "bzImage" -VM_DEFAULT_KERNEL ??= "${KERNEL_IMAGETYPE}" populate_kernel() { dest=$1 install -d $dest # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. - bbnote "Trying to install ${DEPLOY_DIR_IMAGE}/${VM_DEFAULT_KERNEL} as $dest/vmlinuz" - if [ -e ${DEPLOY_DIR_IMAGE}/${VM_DEFAULT_KERNEL} ]; then - install -m 0644 ${DEPLOY_DIR_IMAGE}/${VM_DEFAULT_KERNEL} $dest/vmlinuz + bbnote "Trying to install ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} as $dest/${KERNEL_IMAGETYPE}" + if [ -e ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ]; then + install -m 0644 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} $dest/${KERNEL_IMAGETYPE} else - bbwarn "${DEPLOY_DIR_IMAGE}/${VM_DEFAULT_KERNEL} doesn't exist" + bbwarn "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} doesn't exist" fi # initrd is made of concatenation of multiple filesystem images -- cgit 1.2.3-korg