[oe-commits] [openembedded-core] 32/34: grub-efi-cfg.bbclass: Don't reference or set OVERRIDES

git at git.openembedded.org git at git.openembedded.org
Sun Mar 4 21:24:21 UTC 2018


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

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

commit 8a6a5b176dc92247bc7d3928fcfd1bdeb5ce4242
Author: California Sullivan <california.l.sullivan at intel.com>
AuthorDate: Wed Feb 28 18:15:16 2018 -0800

    grub-efi-cfg.bbclass: Don't reference or set OVERRIDES
    
    There's no need to add to the local copy of overrides and then not do
    anything with it.
    
    Now that this function is being used in package creation it was causing
    sstate issues as well, as MACHINE is always in OVERRIDES, so something
    trivial such as the name of the MACHINE would cause the hash to change.
    
    Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/grub-efi-cfg.bbclass | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/meta/classes/grub-efi-cfg.bbclass b/meta/classes/grub-efi-cfg.bbclass
index 85173c9..d2226af 100644
--- a/meta/classes/grub-efi-cfg.bbclass
+++ b/meta/classes/grub-efi-cfg.bbclass
@@ -87,13 +87,7 @@ python build_efi_cfg() {
     for label in labels.split():
         localdata = d.createCopy()
 
-        overrides = localdata.getVar('OVERRIDES')
-        if not overrides:
-            bb.fatal('OVERRIDES not defined')
-
         for btype in btypes:
-            localdata.setVar('OVERRIDES', label + ':' + overrides)
-
             cfgfile.write('\nmenuentry \'%s%s\'{\n' % (label, btype[0]))
             lb = label
             if label == "install":

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


More information about the Openembedded-commits mailing list