summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-02-28 18:15:03 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-06 06:35:42 -0800
commit9703185a83432ed78ed42a431ea479a4a11fefbf (patch)
treebd66810589db87450d66f7f29990ab3a0af2dcf3
parentbfd48060e362bebdeee8688f4ce60b9dc84b9aa7 (diff)
downloadpoky-9703185a83432ed78ed42a431ea479a4a11fefbf.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. (From OE-Core rev: 5493bb5ba4b4520f944d38b214a3d53a5282e0be) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/live-vm-common.bbclass9
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}
33inherit ${PCBIOS_CLASS} 33inherit ${PCBIOS_CLASS}
34 34
35KERNEL_IMAGETYPE ??= "bzImage" 35KERNEL_IMAGETYPE ??= "bzImage"
36VM_DEFAULT_KERNEL ??= "${KERNEL_IMAGETYPE}"
37 36
38populate_kernel() { 37populate_kernel() {
39 dest=$1 38 dest=$1
40 install -d $dest 39 install -d $dest
41 40
42 # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. 41 # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
43 bbnote "Trying to install ${DEPLOY_DIR_IMAGE}/${VM_DEFAULT_KERNEL} as $dest/vmlinuz" 42 bbnote "Trying to install ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} as $dest/${KERNEL_IMAGETYPE}"
44 if [ -e ${DEPLOY_DIR_IMAGE}/${VM_DEFAULT_KERNEL} ]; then 43 if [ -e ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ]; then
45 install -m 0644 ${DEPLOY_DIR_IMAGE}/${VM_DEFAULT_KERNEL} $dest/vmlinuz 44 install -m 0644 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} $dest/${KERNEL_IMAGETYPE}
46 else 45 else
47 bbwarn "${DEPLOY_DIR_IMAGE}/${VM_DEFAULT_KERNEL} doesn't exist" 46 bbwarn "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} doesn't exist"
48 fi 47 fi
49 48
50 # initrd is made of concatenation of multiple filesystem images 49 # initrd is made of concatenation of multiple filesystem images