From 2d7473a2015dcc0af316f2ba76d157f0f36e796e Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Tue, 26 Feb 2019 11:28:00 +0100 Subject: updater.py: no longer necessary to add meta-python for rpi. Signed-off-by: Patrick Vacek --- lib/oeqa/selftest/cases/updater.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index 08521d5..a34a8cf 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py @@ -235,7 +235,6 @@ class RpiTests(OESelftestTestCase): def setUpLocal(self): # Add layers before changing the machine type, otherwise the sanity # checker complains loudly. - layer_python = "meta-openembedded/meta-python" layer_rpi = "meta-raspberrypi" layer_upd_rpi = "meta-updater-raspberrypi" result = runCmd('bitbake-layers show-layers') @@ -244,11 +243,6 @@ class RpiTests(OESelftestTestCase): # layers we need aren't where we expect them, we are out of luck. path = os.path.abspath(os.path.dirname(__file__)) metadir = path + "/../../../../../" - if re.search(layer_python, result.output) is None: - self.meta_python = metadir + layer_python - runCmd('bitbake-layers add-layer "%s"' % self.meta_python) - else: - self.meta_python = None if re.search(layer_rpi, result.output) is None: self.meta_rpi = metadir + layer_rpi runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) @@ -284,8 +278,6 @@ class RpiTests(OESelftestTestCase): runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) if self.meta_rpi: runCmd('bitbake-layers remove-layer "%s"' % self.meta_rpi, ignore_status=True) - if self.meta_python: - runCmd('bitbake-layers remove-layer "%s"' % self.meta_python, ignore_status=True) def test_rpi(self): logger = logging.getLogger("selftest") -- cgit v1.2.3-54-g00ecf