diff options
author | California Sullivan <california.l.sullivan@intel.com> | 2018-02-28 18:15:17 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-06 06:35:42 -0800 |
commit | 5e039c33d96cd9a2ad686feffd06ca8abef066c5 (patch) | |
tree | e5d72754c31a346ec26d64b8118955385916fedb | |
parent | 3449ae0f5dbaa0b9d7a64d1300156763346b61fc (diff) | |
download | poky-5e039c33d96cd9a2ad686feffd06ca8abef066c5.tar.gz |
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.
(From OE-Core rev: 24ddc80fc39291d9952b8e3bd37d66c1c4376e6b)
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/systemd-boot-cfg.bbclass | 5 |
1 files changed, 0 insertions, 5 deletions
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() { | |||
39 | for label in labels.split(): | 39 | for label in labels.split(): |
40 | localdata = d.createCopy() | 40 | localdata = d.createCopy() |
41 | 41 | ||
42 | overrides = localdata.getVar('OVERRIDES') | ||
43 | if not overrides: | ||
44 | bb.fatal('OVERRIDES not defined') | ||
45 | |||
46 | entryfile = "%s/%s.conf" % (s, label) | 42 | entryfile = "%s/%s.conf" % (s, label) |
47 | if not os.path.exists(s): | 43 | if not os.path.exists(s): |
48 | os.makedirs(s) | 44 | os.makedirs(s) |
@@ -51,7 +47,6 @@ python build_efi_cfg() { | |||
51 | entrycfg = open(entryfile, "w") | 47 | entrycfg = open(entryfile, "w") |
52 | except OSError: | 48 | except OSError: |
53 | bb.fatal('Unable to open %s' % entryfile) | 49 | bb.fatal('Unable to open %s' % entryfile) |
54 | localdata.setVar('OVERRIDES', label + ':' + overrides) | ||
55 | 50 | ||
56 | entrycfg.write('title %s\n' % label) | 51 | entrycfg.write('title %s\n' % label) |
57 | 52 | ||