diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-09 17:11:38 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-15 09:29:55 -0800 |
commit | bfd0a39bdf13f6953810bf868022a871d2a20b6d (patch) | |
tree | e3c3fddc611afb3e70d6fae68e7cbdc42e1fe796 | |
parent | e758547db9048d4aa1c1415d6af8072f519fae24 (diff) | |
download | poky-bfd0a39bdf13f6953810bf868022a871d2a20b6d.tar.gz |
classes: Drop now unneeded update_data calls
Now that the datastore works dynamically we don't need the update_data calls
so we can just remove them. They're not actually done anything at all for
a while.
(From OE-Core rev: 8de0c5d3bd01919e2bf0394f9c485936d6098cec)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
28 files changed, 0 insertions, 53 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 965518c733..d6116e1464 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -222,7 +222,6 @@ python base_eventhandler() { | |||
222 | 222 | ||
223 | if isinstance(e, bb.event.BuildStarted): | 223 | if isinstance(e, bb.event.BuildStarted): |
224 | localdata = bb.data.createCopy(e.data) | 224 | localdata = bb.data.createCopy(e.data) |
225 | bb.data.update_data(localdata) | ||
226 | statuslines = [] | 225 | statuslines = [] |
227 | for func in oe.data.typed_value('BUILDCFG_FUNCS', localdata): | 226 | for func in oe.data.typed_value('BUILDCFG_FUNCS', localdata): |
228 | g = globals() | 227 | g = globals() |
@@ -355,7 +354,6 @@ def set_packagetriplet(d): | |||
355 | localdata = bb.data.createCopy(d) | 354 | localdata = bb.data.createCopy(d) |
356 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item | 355 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item |
357 | localdata.setVar("OVERRIDES", overrides) | 356 | localdata.setVar("OVERRIDES", overrides) |
358 | bb.data.update_data(localdata) | ||
359 | 357 | ||
360 | archs.append(localdata.getVar("PACKAGE_ARCHS").split()) | 358 | archs.append(localdata.getVar("PACKAGE_ARCHS").split()) |
361 | tos.append(localdata.getVar("TARGET_OS")) | 359 | tos.append(localdata.getVar("TARGET_OS")) |
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 73cd88669a..7251a2c351 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
@@ -594,7 +594,6 @@ def buildhistory_get_build_id(d): | |||
594 | if d.getVar('BB_WORKERCONTEXT') != '1': | 594 | if d.getVar('BB_WORKERCONTEXT') != '1': |
595 | return "" | 595 | return "" |
596 | localdata = bb.data.createCopy(d) | 596 | localdata = bb.data.createCopy(d) |
597 | bb.data.update_data(localdata) | ||
598 | statuslines = [] | 597 | statuslines = [] |
599 | for func in oe.data.typed_value('BUILDCFG_FUNCS', localdata): | 598 | for func in oe.data.typed_value('BUILDCFG_FUNCS', localdata): |
600 | g = globals() | 599 | g = globals() |
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index 9587ba0daf..5e34441610 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass | |||
@@ -38,32 +38,27 @@ python do_distrodata_np() { | |||
38 | pnstripped = pn.split("-native") | 38 | pnstripped = pn.split("-native") |
39 | bb.note("Native Split: %s" % pnstripped) | 39 | bb.note("Native Split: %s" % pnstripped) |
40 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 40 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
41 | bb.data.update_data(localdata) | ||
42 | 41 | ||
43 | if pn.find("-cross") != -1: | 42 | if pn.find("-cross") != -1: |
44 | pnstripped = pn.split("-cross") | 43 | pnstripped = pn.split("-cross") |
45 | bb.note("cross Split: %s" % pnstripped) | 44 | bb.note("cross Split: %s" % pnstripped) |
46 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 45 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
47 | bb.data.update_data(localdata) | ||
48 | 46 | ||
49 | if pn.find("-crosssdk") != -1: | 47 | if pn.find("-crosssdk") != -1: |
50 | pnstripped = pn.split("-crosssdk") | 48 | pnstripped = pn.split("-crosssdk") |
51 | bb.note("cross Split: %s" % pnstripped) | 49 | bb.note("cross Split: %s" % pnstripped) |
52 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 50 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
53 | bb.data.update_data(localdata) | ||
54 | 51 | ||
55 | if pn.startswith("nativesdk-"): | 52 | if pn.startswith("nativesdk-"): |
56 | pnstripped = pn.replace("nativesdk-", "") | 53 | pnstripped = pn.replace("nativesdk-", "") |
57 | bb.note("NativeSDK Split: %s" % pnstripped) | 54 | bb.note("NativeSDK Split: %s" % pnstripped) |
58 | localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES')) | 55 | localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES')) |
59 | bb.data.update_data(localdata) | ||
60 | 56 | ||
61 | 57 | ||
62 | if pn.find("-initial") != -1: | 58 | if pn.find("-initial") != -1: |
63 | pnstripped = pn.split("-initial") | 59 | pnstripped = pn.split("-initial") |
64 | bb.note("initial Split: %s" % pnstripped) | 60 | bb.note("initial Split: %s" % pnstripped) |
65 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 61 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
66 | bb.data.update_data(localdata) | ||
67 | 62 | ||
68 | """generate package information from .bb file""" | 63 | """generate package information from .bb file""" |
69 | pname = localdata.getVar('PN') | 64 | pname = localdata.getVar('PN') |
@@ -127,31 +122,26 @@ python do_distrodata() { | |||
127 | pnstripped = pn.split("-native") | 122 | pnstripped = pn.split("-native") |
128 | bb.note("Native Split: %s" % pnstripped) | 123 | bb.note("Native Split: %s" % pnstripped) |
129 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 124 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
130 | bb.data.update_data(localdata) | ||
131 | 125 | ||
132 | if pn.startswith("nativesdk-"): | 126 | if pn.startswith("nativesdk-"): |
133 | pnstripped = pn.replace("nativesdk-", "") | 127 | pnstripped = pn.replace("nativesdk-", "") |
134 | bb.note("NativeSDK Split: %s" % pnstripped) | 128 | bb.note("NativeSDK Split: %s" % pnstripped) |
135 | localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES')) | 129 | localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES')) |
136 | bb.data.update_data(localdata) | ||
137 | 130 | ||
138 | if pn.find("-cross") != -1: | 131 | if pn.find("-cross") != -1: |
139 | pnstripped = pn.split("-cross") | 132 | pnstripped = pn.split("-cross") |
140 | bb.note("cross Split: %s" % pnstripped) | 133 | bb.note("cross Split: %s" % pnstripped) |
141 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 134 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
142 | bb.data.update_data(localdata) | ||
143 | 135 | ||
144 | if pn.find("-crosssdk") != -1: | 136 | if pn.find("-crosssdk") != -1: |
145 | pnstripped = pn.split("-crosssdk") | 137 | pnstripped = pn.split("-crosssdk") |
146 | bb.note("cross Split: %s" % pnstripped) | 138 | bb.note("cross Split: %s" % pnstripped) |
147 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 139 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
148 | bb.data.update_data(localdata) | ||
149 | 140 | ||
150 | if pn.find("-initial") != -1: | 141 | if pn.find("-initial") != -1: |
151 | pnstripped = pn.split("-initial") | 142 | pnstripped = pn.split("-initial") |
152 | bb.note("initial Split: %s" % pnstripped) | 143 | bb.note("initial Split: %s" % pnstripped) |
153 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 144 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
154 | bb.data.update_data(localdata) | ||
155 | 145 | ||
156 | """generate package information from .bb file""" | 146 | """generate package information from .bb file""" |
157 | pname = localdata.getVar('PN') | 147 | pname = localdata.getVar('PN') |
@@ -292,7 +282,6 @@ python do_checkpkg() { | |||
292 | pnstripped = pname.split("-native") | 282 | pnstripped = pname.split("-native") |
293 | bb.note("Native Split: %s" % pnstripped) | 283 | bb.note("Native Split: %s" % pnstripped) |
294 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 284 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
295 | bb.data.update_data(localdata) | ||
296 | 285 | ||
297 | if pname.startswith("nativesdk-"): | 286 | if pname.startswith("nativesdk-"): |
298 | if d.getVar('BBCLASSEXTEND'): | 287 | if d.getVar('BBCLASSEXTEND'): |
@@ -300,19 +289,16 @@ python do_checkpkg() { | |||
300 | pnstripped = pname.replace("nativesdk-", "") | 289 | pnstripped = pname.replace("nativesdk-", "") |
301 | bb.note("NativeSDK Split: %s" % pnstripped) | 290 | bb.note("NativeSDK Split: %s" % pnstripped) |
302 | localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES')) | 291 | localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES')) |
303 | bb.data.update_data(localdata) | ||
304 | 292 | ||
305 | if pname.find("-cross") != -1: | 293 | if pname.find("-cross") != -1: |
306 | pnstripped = pname.split("-cross") | 294 | pnstripped = pname.split("-cross") |
307 | bb.note("cross Split: %s" % pnstripped) | 295 | bb.note("cross Split: %s" % pnstripped) |
308 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 296 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
309 | bb.data.update_data(localdata) | ||
310 | 297 | ||
311 | if pname.find("-initial") != -1: | 298 | if pname.find("-initial") != -1: |
312 | pnstripped = pname.split("-initial") | 299 | pnstripped = pname.split("-initial") |
313 | bb.note("initial Split: %s" % pnstripped) | 300 | bb.note("initial Split: %s" % pnstripped) |
314 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 301 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
315 | bb.data.update_data(localdata) | ||
316 | 302 | ||
317 | pdesc = localdata.getVar('DESCRIPTION') | 303 | pdesc = localdata.getVar('DESCRIPTION') |
318 | pgrp = localdata.getVar('SECTION') | 304 | pgrp = localdata.getVar('SECTION') |
@@ -401,7 +387,6 @@ python do_distro_check() { | |||
401 | return | 387 | return |
402 | 388 | ||
403 | localdata = bb.data.createCopy(d) | 389 | localdata = bb.data.createCopy(d) |
404 | bb.data.update_data(localdata) | ||
405 | tmpdir = d.getVar('TMPDIR') | 390 | tmpdir = d.getVar('TMPDIR') |
406 | distro_check_dir = os.path.join(tmpdir, "distro_check") | 391 | distro_check_dir = os.path.join(tmpdir, "distro_check") |
407 | logpath = d.getVar('LOG_DIR') | 392 | logpath = d.getVar('LOG_DIR') |
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass index 8adda098c4..df7fe18a79 100644 --- a/meta/classes/grub-efi.bbclass +++ b/meta/classes/grub-efi.bbclass | |||
@@ -133,7 +133,6 @@ python build_efi_cfg() { | |||
133 | 133 | ||
134 | for btype in btypes: | 134 | for btype in btypes: |
135 | localdata.setVar('OVERRIDES', label + ':' + overrides) | 135 | localdata.setVar('OVERRIDES', label + ':' + overrides) |
136 | bb.data.update_data(localdata) | ||
137 | 136 | ||
138 | cfgfile.write('\nmenuentry \'%s%s\'{\n' % (label, btype[0])) | 137 | cfgfile.write('\nmenuentry \'%s%s\'{\n' % (label, btype[0])) |
139 | lb = label | 138 | lb = label |
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index b5a4fb4a33..25e00f5daf 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -428,7 +428,6 @@ python () { | |||
428 | debug = "setup_debugfs " | 428 | debug = "setup_debugfs " |
429 | realt = t[8:] | 429 | realt = t[8:] |
430 | localdata.setVar('OVERRIDES', '%s:%s' % (realt, old_overrides)) | 430 | localdata.setVar('OVERRIDES', '%s:%s' % (realt, old_overrides)) |
431 | bb.data.update_data(localdata) | ||
432 | localdata.setVar('type', realt) | 431 | localdata.setVar('type', realt) |
433 | # Delete DATETIME so we don't expand any references to it now | 432 | # Delete DATETIME so we don't expand any references to it now |
434 | # This means the task's hash can be stable rather than having hardcoded | 433 | # This means the task's hash can be stable rather than having hardcoded |
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 3cf86c12c3..7fa0040857 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -910,7 +910,6 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d): | |||
910 | if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg: | 910 | if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg: |
911 | localdata = bb.data.createCopy(d) | 911 | localdata = bb.data.createCopy(d) |
912 | localdata.setVar('OVERRIDES', pkg) | 912 | localdata.setVar('OVERRIDES', pkg) |
913 | bb.data.update_data(localdata) | ||
914 | 913 | ||
915 | # Now check the RDEPENDS | 914 | # Now check the RDEPENDS |
916 | rdepends = bb.utils.explode_deps(localdata.getVar('RDEPENDS') or "") | 915 | rdepends = bb.utils.explode_deps(localdata.getVar('RDEPENDS') or "") |
@@ -1017,7 +1016,6 @@ def package_qa_check_deps(pkg, pkgdest, skip, d): | |||
1017 | 1016 | ||
1018 | localdata = bb.data.createCopy(d) | 1017 | localdata = bb.data.createCopy(d) |
1019 | localdata.setVar('OVERRIDES', pkg) | 1018 | localdata.setVar('OVERRIDES', pkg) |
1020 | bb.data.update_data(localdata) | ||
1021 | 1019 | ||
1022 | def check_valid_deps(var): | 1020 | def check_valid_deps(var): |
1023 | try: | 1021 | try: |
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index a4f70f2dca..401e0c2cc0 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass | |||
@@ -36,7 +36,6 @@ python multilib_virtclass_handler () { | |||
36 | e.data.setVar("MLPREFIX", variant + "-") | 36 | e.data.setVar("MLPREFIX", variant + "-") |
37 | override = ":virtclass-multilib-" + variant | 37 | override = ":virtclass-multilib-" + variant |
38 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) | 38 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) |
39 | bb.data.update_data(e.data) | ||
40 | return | 39 | return |
41 | 40 | ||
42 | if bb.data.inherits_class('native', e.data): | 41 | if bb.data.inherits_class('native', e.data): |
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index c9869fd592..fd0bfe1273 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass | |||
@@ -29,7 +29,6 @@ def preferred_ml_updates(d): | |||
29 | localdata = bb.data.createCopy(d) | 29 | localdata = bb.data.createCopy(d) |
30 | override = ":virtclass-multilib-" + p | 30 | override = ":virtclass-multilib-" + p |
31 | localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) | 31 | localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) |
32 | bb.data.update_data(localdata) | ||
33 | if "-canadian-" in pkg: | 32 | if "-canadian-" in pkg: |
34 | newname = localdata.expand(v) | 33 | newname = localdata.expand(v) |
35 | else: | 34 | else: |
@@ -57,7 +56,6 @@ def preferred_ml_updates(d): | |||
57 | localdata = bb.data.createCopy(d) | 56 | localdata = bb.data.createCopy(d) |
58 | override = ":virtclass-multilib-" + p | 57 | override = ":virtclass-multilib-" + p |
59 | localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) | 58 | localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) |
60 | bb.data.update_data(localdata) | ||
61 | newname = localdata.expand(prov) | 59 | newname = localdata.expand(prov) |
62 | if newname != prov: | 60 | if newname != prov: |
63 | newval = localdata.expand(val) | 61 | newval = localdata.expand(val) |
@@ -80,7 +78,6 @@ def preferred_ml_updates(d): | |||
80 | localdata = bb.data.createCopy(d) | 78 | localdata = bb.data.createCopy(d) |
81 | override = ":virtclass-multilib-" + p | 79 | override = ":virtclass-multilib-" + p |
82 | localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) | 80 | localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) |
83 | bb.data.update_data(localdata) | ||
84 | newname = localdata.expand(prov) | 81 | newname = localdata.expand(prov) |
85 | if newname != prov and not d.getVar(newname, False): | 82 | if newname != prov and not d.getVar(newname, False): |
86 | d.setVar(newname, localdata.expand(newval)) | 83 | d.setVar(newname, localdata.expand(newval)) |
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index eb549ca971..4f107b58ee 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
@@ -106,7 +106,6 @@ python do_package_deb () { | |||
106 | 106 | ||
107 | localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) | 107 | localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) |
108 | 108 | ||
109 | bb.data.update_data(localdata) | ||
110 | basedir = os.path.join(os.path.dirname(root)) | 109 | basedir = os.path.join(os.path.dirname(root)) |
111 | 110 | ||
112 | pkgoutdir = os.path.join(outdir, localdata.getVar('PACKAGE_ARCH')) | 111 | pkgoutdir = os.path.join(outdir, localdata.getVar('PACKAGE_ARCH')) |
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index a76b23538e..fa47385fa8 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -63,7 +63,6 @@ python do_package_ipk () { | |||
63 | 63 | ||
64 | localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) | 64 | localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) |
65 | 65 | ||
66 | bb.data.update_data(localdata) | ||
67 | basedir = os.path.join(os.path.dirname(root)) | 66 | basedir = os.path.join(os.path.dirname(root)) |
68 | arch = localdata.getVar('PACKAGE_ARCH') | 67 | arch = localdata.getVar('PACKAGE_ARCH') |
69 | 68 | ||
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index bde0453287..db448ab8d1 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -335,8 +335,6 @@ python write_specfile () { | |||
335 | 335 | ||
336 | localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) | 336 | localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) |
337 | 337 | ||
338 | bb.data.update_data(localdata) | ||
339 | |||
340 | conffiles = get_conffiles(pkg, d) | 338 | conffiles = get_conffiles(pkg, d) |
341 | dirfiles = localdata.getVar('DIRFILES') | 339 | dirfiles = localdata.getVar('DIRFILES') |
342 | if dirfiles is not None: | 340 | if dirfiles is not None: |
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass index 1ffc4169e2..ce3ab4c8e2 100644 --- a/meta/classes/package_tar.bbclass +++ b/meta/classes/package_tar.bbclass | |||
@@ -38,7 +38,6 @@ python do_package_tar () { | |||
38 | 38 | ||
39 | overrides = localdata.getVar('OVERRIDES', False) | 39 | overrides = localdata.getVar('OVERRIDES', False) |
40 | localdata.setVar('OVERRIDES', '%s:%s' % (overrides, pkg)) | 40 | localdata.setVar('OVERRIDES', '%s:%s' % (overrides, pkg)) |
41 | bb.data.update_data(localdata) | ||
42 | 41 | ||
43 | bb.utils.mkdirhier(root) | 42 | bb.utils.mkdirhier(root) |
44 | basedir = os.path.dirname(root) | 43 | basedir = os.path.dirname(root) |
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 95b3d23112..fff0f128f5 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -657,7 +657,6 @@ do_sdk_depends[rdepends] = "${@get_sdk_ext_rdepends(d)}" | |||
657 | def get_sdk_ext_rdepends(d): | 657 | def get_sdk_ext_rdepends(d): |
658 | localdata = d.createCopy() | 658 | localdata = d.createCopy() |
659 | localdata.appendVar('OVERRIDES', ':task-populate-sdk-ext') | 659 | localdata.appendVar('OVERRIDES', ':task-populate-sdk-ext') |
660 | bb.data.update_data(localdata) | ||
661 | return localdata.getVarFlag('do_populate_sdk', 'rdepends') | 660 | return localdata.getVarFlag('do_populate_sdk', 'rdepends') |
662 | 661 | ||
663 | do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}" | 662 | do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}" |
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 7bcceee31b..0f3ede2be4 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -226,7 +226,6 @@ def check_toolchain_tune(data, tune, multilib): | |||
226 | # Apply the overrides so we can look at the details. | 226 | # Apply the overrides so we can look at the details. |
227 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + multilib | 227 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + multilib |
228 | localdata.setVar("OVERRIDES", overrides) | 228 | localdata.setVar("OVERRIDES", overrides) |
229 | bb.data.update_data(localdata) | ||
230 | bb.debug(2, "Sanity-checking tuning '%s' (%s) features:" % (tune, multilib)) | 229 | bb.debug(2, "Sanity-checking tuning '%s' (%s) features:" % (tune, multilib)) |
231 | features = (localdata.getVar("TUNE_FEATURES_tune-%s" % tune) or "").split() | 230 | features = (localdata.getVar("TUNE_FEATURES_tune-%s" % tune) or "").split() |
232 | if not features: | 231 | if not features: |
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index bd9c2ae02e..465fdcf57d 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -645,7 +645,6 @@ def pstaging_fetch(sstatefetch, sstatepkg, d): | |||
645 | 645 | ||
646 | # Copy the data object and override DL_DIR and SRC_URI | 646 | # Copy the data object and override DL_DIR and SRC_URI |
647 | localdata = bb.data.createCopy(d) | 647 | localdata = bb.data.createCopy(d) |
648 | bb.data.update_data(localdata) | ||
649 | 648 | ||
650 | dldir = localdata.expand("${SSTATE_DIR}") | 649 | dldir = localdata.expand("${SSTATE_DIR}") |
651 | bb.utils.mkdirhier(dldir) | 650 | bb.utils.mkdirhier(dldir) |
@@ -802,7 +801,6 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d, siginfo=False): | |||
802 | if mirrors: | 801 | if mirrors: |
803 | # Copy the data object and override DL_DIR and SRC_URI | 802 | # Copy the data object and override DL_DIR and SRC_URI |
804 | localdata = bb.data.createCopy(d) | 803 | localdata = bb.data.createCopy(d) |
805 | bb.data.update_data(localdata) | ||
806 | 804 | ||
807 | dldir = localdata.expand("${SSTATE_DIR}") | 805 | dldir = localdata.expand("${SSTATE_DIR}") |
808 | localdata.delVar('MIRRORS') | 806 | localdata.delVar('MIRRORS') |
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass index d8859b35bd..d6f882420e 100644 --- a/meta/classes/syslinux.bbclass +++ b/meta/classes/syslinux.bbclass | |||
@@ -163,7 +163,6 @@ python build_syslinux_cfg () { | |||
163 | bb.fatal('OVERRIDES not defined') | 163 | bb.fatal('OVERRIDES not defined') |
164 | 164 | ||
165 | localdata.setVar('OVERRIDES', label + ':' + overrides) | 165 | localdata.setVar('OVERRIDES', label + ':' + overrides) |
166 | bb.data.update_data(localdata) | ||
167 | 166 | ||
168 | btypes = [ [ "", syslinux_default_console ] ] | 167 | btypes = [ [ "", syslinux_default_console ] ] |
169 | if menu and syslinux_serial: | 168 | if menu and syslinux_serial: |
diff --git a/meta/classes/systemd-boot.bbclass b/meta/classes/systemd-boot.bbclass index 6a2cbc8a93..6d002c0e4e 100644 --- a/meta/classes/systemd-boot.bbclass +++ b/meta/classes/systemd-boot.bbclass | |||
@@ -103,7 +103,6 @@ python build_efi_cfg() { | |||
103 | except OSError: | 103 | except OSError: |
104 | bb.fatal('Unable to open %s' % entryfile) | 104 | bb.fatal('Unable to open %s' % entryfile) |
105 | localdata.setVar('OVERRIDES', label + ':' + overrides) | 105 | localdata.setVar('OVERRIDES', label + ':' + overrides) |
106 | bb.data.update_data(localdata) | ||
107 | 106 | ||
108 | entrycfg.write('title %s\n' % label) | 107 | entrycfg.write('title %s\n' % label) |
109 | entrycfg.write('linux /vmlinuz\n') | 108 | entrycfg.write('linux /vmlinuz\n') |
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 1ce0b948b1..c4b4bb9b70 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass | |||
@@ -89,7 +89,6 @@ python systemd_populate_packages() { | |||
89 | # variable. | 89 | # variable. |
90 | localdata = d.createCopy() | 90 | localdata = d.createCopy() |
91 | localdata.prependVar("OVERRIDES", pkg + ":") | 91 | localdata.prependVar("OVERRIDES", pkg + ":") |
92 | bb.data.update_data(localdata) | ||
93 | 92 | ||
94 | postinst = d.getVar('pkg_postinst_%s' % pkg) | 93 | postinst = d.getVar('pkg_postinst_%s' % pkg) |
95 | if not postinst: | 94 | if not postinst: |
diff --git a/meta/classes/uboot-extlinux-config.bbclass b/meta/classes/uboot-extlinux-config.bbclass index ec5fffb7bb..904d5b3cfd 100644 --- a/meta/classes/uboot-extlinux-config.bbclass +++ b/meta/classes/uboot-extlinux-config.bbclass | |||
@@ -90,7 +90,6 @@ python create_extlinux_config() { | |||
90 | bb.fatal('OVERRIDES not defined') | 90 | bb.fatal('OVERRIDES not defined') |
91 | 91 | ||
92 | localdata.setVar('OVERRIDES', label + ':' + overrides) | 92 | localdata.setVar('OVERRIDES', label + ':' + overrides) |
93 | bb.data.update_data(localdata) | ||
94 | 93 | ||
95 | extlinux_console = localdata.getVar('UBOOT_EXTLINUX_CONSOLE') | 94 | extlinux_console = localdata.getVar('UBOOT_EXTLINUX_CONSOLE') |
96 | 95 | ||
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 36f9009500..9ba3daccaf 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass | |||
@@ -104,7 +104,6 @@ python populate_packages_updatercd () { | |||
104 | localdata = bb.data.createCopy(d) | 104 | localdata = bb.data.createCopy(d) |
105 | overrides = localdata.getVar("OVERRIDES") | 105 | overrides = localdata.getVar("OVERRIDES") |
106 | localdata.setVar("OVERRIDES", "%s:%s" % (pkg, overrides)) | 106 | localdata.setVar("OVERRIDES", "%s:%s" % (pkg, overrides)) |
107 | bb.data.update_data(localdata) | ||
108 | 107 | ||
109 | update_rcd_auto_depend(pkg) | 108 | update_rcd_auto_depend(pkg) |
110 | 109 | ||
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index fe75f73a77..96463ab323 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass | |||
@@ -368,7 +368,6 @@ def get_multilib_datastore(variant, d): | |||
368 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant | 368 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant |
369 | localdata.setVar("OVERRIDES", overrides) | 369 | localdata.setVar("OVERRIDES", overrides) |
370 | localdata.setVar("MLPREFIX", variant + "-") | 370 | localdata.setVar("MLPREFIX", variant + "-") |
371 | bb.data.update_data(localdata) | ||
372 | return localdata | 371 | return localdata |
373 | 372 | ||
374 | def all_multilib_tune_values(d, var, unique = True, need_split = True, delim = ' '): | 373 | def all_multilib_tune_values(d, var, unique = True, need_split = True, delim = ' '): |
@@ -423,7 +422,6 @@ def all_multilib_tune_list(vars, d): | |||
423 | origdefault = localdata.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL") | 422 | origdefault = localdata.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL") |
424 | if origdefault: | 423 | if origdefault: |
425 | localdata.setVar("DEFAULTTUNE", origdefault) | 424 | localdata.setVar("DEFAULTTUNE", origdefault) |
426 | bb.data.update_data(localdata) | ||
427 | values['ml'] = [''] | 425 | values['ml'] = [''] |
428 | for v in vars: | 426 | for v in vars: |
429 | values[v].append(localdata.getVar(v)) | 427 | values[v].append(localdata.getVar(v)) |
diff --git a/meta/lib/oe/distro_check.py b/meta/lib/oe/distro_check.py index f54f4bb67d..37f04ed359 100644 --- a/meta/lib/oe/distro_check.py +++ b/meta/lib/oe/distro_check.py | |||
@@ -230,25 +230,21 @@ def compare_in_distro_packages_list(distro_check_dir, d): | |||
230 | if pn.find("-native") != -1: | 230 | if pn.find("-native") != -1: |
231 | pnstripped = pn.split("-native") | 231 | pnstripped = pn.split("-native") |
232 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 232 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
233 | bb.data.update_data(localdata) | ||
234 | recipe_name = pnstripped[0] | 233 | recipe_name = pnstripped[0] |
235 | 234 | ||
236 | if pn.startswith("nativesdk-"): | 235 | if pn.startswith("nativesdk-"): |
237 | pnstripped = pn.split("nativesdk-") | 236 | pnstripped = pn.split("nativesdk-") |
238 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[1] + ":" + d.getVar('OVERRIDES')) | 237 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[1] + ":" + d.getVar('OVERRIDES')) |
239 | bb.data.update_data(localdata) | ||
240 | recipe_name = pnstripped[1] | 238 | recipe_name = pnstripped[1] |
241 | 239 | ||
242 | if pn.find("-cross") != -1: | 240 | if pn.find("-cross") != -1: |
243 | pnstripped = pn.split("-cross") | 241 | pnstripped = pn.split("-cross") |
244 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 242 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
245 | bb.data.update_data(localdata) | ||
246 | recipe_name = pnstripped[0] | 243 | recipe_name = pnstripped[0] |
247 | 244 | ||
248 | if pn.find("-initial") != -1: | 245 | if pn.find("-initial") != -1: |
249 | pnstripped = pn.split("-initial") | 246 | pnstripped = pn.split("-initial") |
250 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 247 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
251 | bb.data.update_data(localdata) | ||
252 | recipe_name = pnstripped[0] | 248 | recipe_name = pnstripped[0] |
253 | 249 | ||
254 | bb.note("Recipe: %s" % recipe_name) | 250 | bb.note("Recipe: %s" % recipe_name) |
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index f92f2b3304..79f0a8b9f1 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -128,7 +128,6 @@ class RpmIndexer(Indexer): | |||
128 | default_tune = localdata.getVar(default_tune_key, False) | 128 | default_tune = localdata.getVar(default_tune_key, False) |
129 | if default_tune: | 129 | if default_tune: |
130 | localdata.setVar("DEFAULTTUNE", default_tune) | 130 | localdata.setVar("DEFAULTTUNE", default_tune) |
131 | bb.data.update_data(localdata) | ||
132 | package_archs[eext[1]] = localdata.getVar('PACKAGE_ARCHS').split() | 131 | package_archs[eext[1]] = localdata.getVar('PACKAGE_ARCHS').split() |
133 | package_archs[eext[1]].reverse() | 132 | package_archs[eext[1]].reverse() |
134 | target_os[eext[1]] = localdata.getVar("TARGET_OS").strip() | 133 | target_os[eext[1]] = localdata.getVar("TARGET_OS").strip() |
@@ -2189,7 +2188,6 @@ class DpkgPM(OpkgDpkgPM): | |||
2189 | variant_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + variant, False) | 2188 | variant_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + variant, False) |
2190 | orig_arch = localdata.getVar("DPKG_ARCH") | 2189 | orig_arch = localdata.getVar("DPKG_ARCH") |
2191 | localdata.setVar("DEFAULTTUNE", variant_tune) | 2190 | localdata.setVar("DEFAULTTUNE", variant_tune) |
2192 | bb.data.update_data(localdata) | ||
2193 | variant_arch = localdata.getVar("DPKG_ARCH") | 2191 | variant_arch = localdata.getVar("DPKG_ARCH") |
2194 | if variant_arch not in base_arch_list: | 2192 | if variant_arch not in base_arch_list: |
2195 | base_arch_list.append(variant_arch) | 2193 | base_arch_list.append(variant_arch) |
diff --git a/meta/recipes-core/glibc/glibc-ld.inc b/meta/recipes-core/glibc/glibc-ld.inc index c26643707d..b89b70a293 100644 --- a/meta/recipes-core/glibc/glibc-ld.inc +++ b/meta/recipes-core/glibc/glibc-ld.inc | |||
@@ -37,7 +37,6 @@ def glibc_dl_info(d): | |||
37 | localdata = bb.data.createCopy(d) | 37 | localdata = bb.data.createCopy(d) |
38 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item | 38 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item |
39 | localdata.setVar("OVERRIDES", overrides) | 39 | localdata.setVar("OVERRIDES", overrides) |
40 | bb.data.update_data(localdata) | ||
41 | ld_append_if_tune_exists(localdata, infos, ld_info_all) | 40 | ld_append_if_tune_exists(localdata, infos, ld_info_all) |
42 | infos['ldconfig'] = ','.join(infos['ldconfig']) | 41 | infos['ldconfig'] = ','.join(infos['ldconfig']) |
43 | infos['lddrewrite'] = ' '.join(infos['lddrewrite']) | 42 | infos['lddrewrite'] = ' '.join(infos['lddrewrite']) |
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index c7ac05d62a..29da121a3a 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb | |||
@@ -43,7 +43,6 @@ python do_generate_content() { | |||
43 | overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item | 43 | overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item |
44 | localdata.setVar("OVERRIDES", overrides) | 44 | localdata.setVar("OVERRIDES", overrides) |
45 | localdata.setVar("MLPREFIX", item + "-") | 45 | localdata.setVar("MLPREFIX", item + "-") |
46 | bb.data.update_data(localdata) | ||
47 | bb.build.exec_func("create_sdk_files", localdata) | 46 | bb.build.exec_func("create_sdk_files", localdata) |
48 | } | 47 | } |
49 | addtask generate_content before do_install after do_compile | 48 | addtask generate_content before do_install after do_compile |
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 44e7c2891c..74578d94ff 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc | |||
@@ -71,7 +71,6 @@ def get_tune_parameters(tune, d): | |||
71 | localdata = bb.data.createCopy(d) | 71 | localdata = bb.data.createCopy(d) |
72 | override = ':tune-' + tune | 72 | override = ':tune-' + tune |
73 | localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES', False) + override) | 73 | localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES', False) + override) |
74 | bb.data.update_data(localdata) | ||
75 | 74 | ||
76 | retdict = {} | 75 | retdict = {} |
77 | retdict['tune'] = tune | 76 | retdict['tune'] = tune |
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb index 2d27588550..883dbc7866 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb | |||
@@ -639,7 +639,6 @@ def multilib_rpmmacros(d): | |||
639 | overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item | 639 | overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item |
640 | localdata.setVar("OVERRIDES", overrides) | 640 | localdata.setVar("OVERRIDES", overrides) |
641 | localdata.setVar("MLPREFIX", item + "-") | 641 | localdata.setVar("MLPREFIX", item + "-") |
642 | bb.data.update_data(localdata) | ||
643 | localdata.setVar('WORKDIR', workdirVal) | 642 | localdata.setVar('WORKDIR', workdirVal) |
644 | localdata.setVar('distromacrodir', distromacrodirVal) | 643 | localdata.setVar('distromacrodir', distromacrodirVal) |
645 | localdata.setVar('D', dval) | 644 | localdata.setVar('D', dval) |
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 5bd3853794..1be3f14f86 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py | |||
@@ -348,7 +348,6 @@ def supports_srcrev(uri): | |||
348 | # This is a bit sad, but if you don't have this set there can be some | 348 | # This is a bit sad, but if you don't have this set there can be some |
349 | # odd interactions with the urldata cache which lead to errors | 349 | # odd interactions with the urldata cache which lead to errors |
350 | localdata.setVar('SRCREV', '${AUTOREV}') | 350 | localdata.setVar('SRCREV', '${AUTOREV}') |
351 | bb.data.update_data(localdata) | ||
352 | try: | 351 | try: |
353 | fetcher = bb.fetch2.Fetch([uri], localdata) | 352 | fetcher = bb.fetch2.Fetch([uri], localdata) |
354 | urldata = fetcher.ud | 353 | urldata = fetcher.ud |