diff options
| author | California Sullivan <california.l.sullivan@intel.com> | 2018-02-28 18:15:10 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-06 06:23:06 -0800 |
| commit | cceb4266f3e70382e171c3a338c10d9730c9dc3f (patch) | |
| tree | c3566d560c478a54ef590cf279362b990a9374e0 | |
| parent | 8bf86db982b4304c47b1d83ea8b2fc63eaa64b20 (diff) | |
| download | openembedded-core-cceb4266f3e70382e171c3a338c10d9730c9dc3f.tar.gz openembedded-core-cceb4266f3e70382e171c3a338c10d9730c9dc3f.tar.bz2 openembedded-core-cceb4266f3e70382e171c3a338c10d9730c9dc3f.zip | |
systemd-boot*.bbclass: Don't use vmlinuz
We can't guarantee vmlinuz anymore. Use KERNEL_IMAGETYPE instead.
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/systemd-boot-cfg.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/systemd-boot.bbclass | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/systemd-boot-cfg.bbclass b/meta/classes/systemd-boot-cfg.bbclass index 46eeae126a..360c86cbd3 100644 --- a/meta/classes/systemd-boot-cfg.bbclass +++ b/meta/classes/systemd-boot-cfg.bbclass @@ -1,3 +1,5 @@ +KERNEL_IMAGETYPE ??= "bzImage" + SYSTEMD_BOOT_CFG ?= "${S}/loader.conf" SYSTEMD_BOOT_ENTRIES ?= "" SYSTEMD_BOOT_TIMEOUT ?= "10" @@ -52,7 +54,9 @@ python build_efi_cfg() { localdata.setVar('OVERRIDES', label + ':' + overrides) entrycfg.write('title %s\n' % label) - entrycfg.write('linux /vmlinuz\n') + + kernel = localdata.getVar("KERNEL_IMAGETYPE") + entrycfg.write('linux /%s\n' % kernel) append = localdata.getVar('APPEND') initrd = localdata.getVar('INITRD') diff --git a/meta/classes/systemd-boot.bbclass b/meta/classes/systemd-boot.bbclass index 14538fe2d7..3cd6811a6c 100644 --- a/meta/classes/systemd-boot.bbclass +++ b/meta/classes/systemd-boot.bbclass @@ -45,7 +45,7 @@ efi_iso_populate() { mkdir -p ${EFIIMGDIR}/${EFIDIR} cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} cp -r $iso_dir/loader ${EFIIMGDIR} - cp $iso_dir/vmlinuz ${EFIIMGDIR} + cp $iso_dir/${KERNEL_IMAGETYPE} ${EFIIMGDIR} EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g') echo "fs0:${EFIPATH}\\${DEST_EFI_IMAGE}" > ${EFIIMGDIR}/startup.nsh if [ -f "$iso_dir/initrd" ] ; then |