[oe-commits] [openembedded-core] 09/12: grub-efi-cfg: enable per-label APPEND override

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 20ad7705d1060300d53304c259b1f07d04b86eba
Author: Rich Persaud <rp at stacktrust.org>
AuthorDate: Mon Mar 9 18:44:57 2020 -0400

    grub-efi-cfg: enable per-label APPEND override
    
    For legacy bios boot configurations, syslinux supports multiple
    labels with per-label APPEND definitions.  grub-efi-cfg supports
    multiple labels, but only a single APPEND definition.
    
    Enable optional per-label APPEND definitions for grub EFI, with
    variable names prefixed by "grub_" to isolate grub definitions from
    syslinux defintions.
    
    Example use from an ISO image recipe that inherits grub-efi-cfg:
    
     LABELS_LIVE="foo bar"
     APPEND_grub_foo = "linuxcmdline"
    
    No change in behavior for those using APPEND without overrides.
    
    Signed-off-by: Rich Persaud <rp at stacktrust.org>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/grub-efi-cfg.bbclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/classes/grub-efi-cfg.bbclass b/meta/classes/grub-efi-cfg.bbclass
index 8b5ff20..3a2cdd6 100644
--- a/meta/classes/grub-efi-cfg.bbclass
+++ b/meta/classes/grub-efi-cfg.bbclass
@@ -88,6 +88,12 @@ python build_efi_cfg() {
     for label in labels.split():
         localdata = d.createCopy()
 
+        overrides = localdata.getVar('OVERRIDES')
+        if not overrides:
+            bb.fatal('OVERRIDES not defined')
+
+        localdata.setVar('OVERRIDES', 'grub_' + label + ':' + overrides)
+
         for btype in btypes:
             cfgfile.write('\nmenuentry \'%s%s\'{\n' % (label, btype[0]))
             lb = label

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.