From e0494a64f181f6112565172c8e2d06f6099153cf Mon Sep 17 00:00:00 2001 From: Charles-Antoine Couret Date: Mon, 25 Sep 2023 01:21:17 +0200 Subject: [PATCH] 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 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes-recipe/systemd-boot-cfg.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() { bb.fatal('Unable to open %s' % cfile) cfgfile.write('# Automatically created by OE\n') - cfgfile.write('default %s\n' % (labels.split()[0])) + cfgfile.write('default %s.conf\n' % (labels.split()[0])) timeout = d.getVar('SYSTEMD_BOOT_TIMEOUT') if timeout: cfgfile.write('timeout %s\n' % timeout)