diff options
author | Charles-Antoine Couret <charles-antoine.couret@mind.be> | 2023-09-25 01:21:17 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-26 10:35:28 +0100 |
commit | e0494a64f181f6112565172c8e2d06f6099153cf (patch) | |
tree | 0621e150adc09cd64169d319a858a91fa41681af /meta/classes-recipe/systemd-boot-cfg.bbclass | |
parent | 1d8d9b1f87b21af36d9c328132f71c528eefd5b0 (diff) | |
download | poky-e0494a64f181f6112565172c8e2d06f6099153cf.tar.gz |
systemd-boot-cfg: add .conf suffix to default entry label
Since systemd v245 (commit 6cd12ebcfe459466257ea63022a32515d756e719), systemd-boot
expects default entry to have the complete filename as value.
LABELS from poky are by default without any suffixes like "boot install", so default entry
does not have the .conf suffix as well and systemd-boot is not able to use this information
and it's starting in any case the first entry. To be able to start another entry by default,
.conf suffix is required.
With this change, LABELS variable can still be used by other bootloaders and being used as description
field.
(From OE-Core rev: 1adf70729dafc9729e665986ad2e2250cbd25c5b)
Signed-off-by: Charles-Antoine Couret <charles-antoine.couret@mind.be>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe/systemd-boot-cfg.bbclass')
-rw-r--r-- | meta/classes-recipe/systemd-boot-cfg.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-recipe/systemd-boot-cfg.bbclass b/meta/classes-recipe/systemd-boot-cfg.bbclass index 366dd23738..12da41ebad 100644 --- a/meta/classes-recipe/systemd-boot-cfg.bbclass +++ b/meta/classes-recipe/systemd-boot-cfg.bbclass | |||
@@ -35,7 +35,7 @@ python build_efi_cfg() { | |||
35 | bb.fatal('Unable to open %s' % cfile) | 35 | bb.fatal('Unable to open %s' % cfile) |
36 | 36 | ||
37 | cfgfile.write('# Automatically created by OE\n') | 37 | cfgfile.write('# Automatically created by OE\n') |
38 | cfgfile.write('default %s\n' % (labels.split()[0])) | 38 | cfgfile.write('default %s.conf\n' % (labels.split()[0])) |
39 | timeout = d.getVar('SYSTEMD_BOOT_TIMEOUT') | 39 | timeout = d.getVar('SYSTEMD_BOOT_TIMEOUT') |
40 | if timeout: | 40 | if timeout: |
41 | cfgfile.write('timeout %s\n' % timeout) | 41 | cfgfile.write('timeout %s\n' % timeout) |