From bfd0a39bdf13f6953810bf868022a871d2a20b6d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 9 Feb 2017 17:11:38 +0000 Subject: 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 --- meta/lib/oe/distro_check.py | 4 ---- meta/lib/oe/package_manager.py | 2 -- 2 files changed, 6 deletions(-) (limited to 'meta/lib') 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): if pn.find("-native") != -1: pnstripped = pn.split("-native") localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) - bb.data.update_data(localdata) recipe_name = pnstripped[0] if pn.startswith("nativesdk-"): pnstripped = pn.split("nativesdk-") localdata.setVar('OVERRIDES', "pn-" + pnstripped[1] + ":" + d.getVar('OVERRIDES')) - bb.data.update_data(localdata) recipe_name = pnstripped[1] if pn.find("-cross") != -1: pnstripped = pn.split("-cross") localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) - bb.data.update_data(localdata) recipe_name = pnstripped[0] if pn.find("-initial") != -1: pnstripped = pn.split("-initial") localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) - bb.data.update_data(localdata) recipe_name = pnstripped[0] 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): default_tune = localdata.getVar(default_tune_key, False) if default_tune: localdata.setVar("DEFAULTTUNE", default_tune) - bb.data.update_data(localdata) package_archs[eext[1]] = localdata.getVar('PACKAGE_ARCHS').split() package_archs[eext[1]].reverse() target_os[eext[1]] = localdata.getVar("TARGET_OS").strip() @@ -2189,7 +2188,6 @@ class DpkgPM(OpkgDpkgPM): variant_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + variant, False) orig_arch = localdata.getVar("DPKG_ARCH") localdata.setVar("DEFAULTTUNE", variant_tune) - bb.data.update_data(localdata) variant_arch = localdata.getVar("DPKG_ARCH") if variant_arch not in base_arch_list: base_arch_list.append(variant_arch) -- cgit v1.2.3-54-g00ecf