summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-09 17:11:38 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-15 09:29:55 -0800
commitbfd0a39bdf13f6953810bf868022a871d2a20b6d (patch)
treee3c3fddc611afb3e70d6fae68e7cbdc42e1fe796 /meta/lib
parente758547db9048d4aa1c1415d6af8072f519fae24 (diff)
downloadpoky-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>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/distro_check.py4
-rw-r--r--meta/lib/oe/package_manager.py2
2 files changed, 0 insertions, 6 deletions
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)