diff options
| author |   California Sullivan <california.l.sullivan@intel.com> | 2018-02-28 18:15:03 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-06 06:23:06 -0800 |
| commit | 5493bb5ba4b4520f944d38b214a3d53a5282e0be (patch) | |
| tree | 47c0b3a1bbba0258ee28004b34be1c67da7d9328 /meta/classes | |
| parent | d8a670726fb6b2553c792a1c66346f975f040135 (diff) | |
| download | openembedded-core-contrib-5493bb5ba4b4520f944d38b214a3d53a5282e0be.tar.gz | |
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 <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/live-vm-common.bbclass | 9 |
1 files changed, 4 insertions, 5 deletions
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 |