From: California Sullivan Date: Thu, 1 Mar 2018 02:15:17 +0000 (-0800) Subject: systemd-boot-cfg.bbclass: Don't reference or set OVERRIDES X-Git-Tag: uninative-1.8~124 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=24ddc80fc39291d9952b8e3bd37d66c1c4376e6b;p=openembedded-core.git systemd-boot-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 Signed-off-by: Richard Purdie --- diff --git a/meta/classes/systemd-boot-cfg.bbclass b/meta/classes/systemd-boot-cfg.bbclass index 360c86cbd3..107758548c 100644 --- a/meta/classes/systemd-boot-cfg.bbclass +++ b/meta/classes/systemd-boot-cfg.bbclass @@ -39,10 +39,6 @@ python build_efi_cfg() { for label in labels.split(): localdata = d.createCopy() - overrides = localdata.getVar('OVERRIDES') - if not overrides: - bb.fatal('OVERRIDES not defined') - entryfile = "%s/%s.conf" % (s, label) if not os.path.exists(s): os.makedirs(s) @@ -51,7 +47,6 @@ python build_efi_cfg() { entrycfg = open(entryfile, "w") except OSError: bb.fatal('Unable to open %s' % entryfile) - localdata.setVar('OVERRIDES', label + ':' + overrides) entrycfg.write('title %s\n' % label)