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:35:42 -0800 |
commit | 00acdebbeda4812a49b8f06a82748f6a515e9460 (patch) | |
tree | 9d909a9dc0572d42199adc6c8e20b4583eb26421 /meta/classes/systemd-boot-cfg.bbclass | |
parent | b84b4223400d76a93b45b1b5f5ba0711d12366a8 (diff) | |
download | poky-00acdebbeda4812a49b8f06a82748f6a515e9460.tar.gz |
systemd-boot*.bbclass: Don't use vmlinuz
We can't guarantee vmlinuz anymore. Use KERNEL_IMAGETYPE instead.
(From OE-Core rev: cceb4266f3e70382e171c3a338c10d9730c9dc3f)
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/systemd-boot-cfg.bbclass')
-rw-r--r-- | meta/classes/systemd-boot-cfg.bbclass | 6 |
1 files changed, 5 insertions, 1 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 @@ | |||
1 | KERNEL_IMAGETYPE ??= "bzImage" | ||
2 | |||
1 | SYSTEMD_BOOT_CFG ?= "${S}/loader.conf" | 3 | SYSTEMD_BOOT_CFG ?= "${S}/loader.conf" |
2 | SYSTEMD_BOOT_ENTRIES ?= "" | 4 | SYSTEMD_BOOT_ENTRIES ?= "" |
3 | SYSTEMD_BOOT_TIMEOUT ?= "10" | 5 | SYSTEMD_BOOT_TIMEOUT ?= "10" |
@@ -52,7 +54,9 @@ python build_efi_cfg() { | |||
52 | localdata.setVar('OVERRIDES', label + ':' + overrides) | 54 | localdata.setVar('OVERRIDES', label + ':' + overrides) |
53 | 55 | ||
54 | entrycfg.write('title %s\n' % label) | 56 | entrycfg.write('title %s\n' % label) |
55 | entrycfg.write('linux /vmlinuz\n') | 57 | |
58 | kernel = localdata.getVar("KERNEL_IMAGETYPE") | ||
59 | entrycfg.write('linux /%s\n' % kernel) | ||
56 | 60 | ||
57 | append = localdata.getVar('APPEND') | 61 | append = localdata.getVar('APPEND') |
58 | initrd = localdata.getVar('INITRD') | 62 | initrd = localdata.getVar('INITRD') |