diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2019-02-26 11:28:00 +0100 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2019-02-26 11:28:00 +0100 |
commit | 2d7473a2015dcc0af316f2ba76d157f0f36e796e (patch) | |
tree | c318c611e76d8cb36f65ae129ee783f887cf90c8 | |
parent | d534c0216d718ce68b5d73c78d19037443ce72d1 (diff) | |
download | meta-updater-2d7473a2015dcc0af316f2ba76d157f0f36e796e.tar.gz |
updater.py: no longer necessary to add meta-python for rpi.fix/meta-python-depend
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
-rw-r--r-- | lib/oeqa/selftest/cases/updater.py | 8 |
1 files changed, 0 insertions, 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): | |||
235 | def setUpLocal(self): | 235 | def setUpLocal(self): |
236 | # Add layers before changing the machine type, otherwise the sanity | 236 | # Add layers before changing the machine type, otherwise the sanity |
237 | # checker complains loudly. | 237 | # checker complains loudly. |
238 | layer_python = "meta-openembedded/meta-python" | ||
239 | layer_rpi = "meta-raspberrypi" | 238 | layer_rpi = "meta-raspberrypi" |
240 | layer_upd_rpi = "meta-updater-raspberrypi" | 239 | layer_upd_rpi = "meta-updater-raspberrypi" |
241 | result = runCmd('bitbake-layers show-layers') | 240 | result = runCmd('bitbake-layers show-layers') |
@@ -244,11 +243,6 @@ class RpiTests(OESelftestTestCase): | |||
244 | # layers we need aren't where we expect them, we are out of luck. | 243 | # layers we need aren't where we expect them, we are out of luck. |
245 | path = os.path.abspath(os.path.dirname(__file__)) | 244 | path = os.path.abspath(os.path.dirname(__file__)) |
246 | metadir = path + "/../../../../../" | 245 | metadir = path + "/../../../../../" |
247 | if re.search(layer_python, result.output) is None: | ||
248 | self.meta_python = metadir + layer_python | ||
249 | runCmd('bitbake-layers add-layer "%s"' % self.meta_python) | ||
250 | else: | ||
251 | self.meta_python = None | ||
252 | if re.search(layer_rpi, result.output) is None: | 246 | if re.search(layer_rpi, result.output) is None: |
253 | self.meta_rpi = metadir + layer_rpi | 247 | self.meta_rpi = metadir + layer_rpi |
254 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) | 248 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) |
@@ -284,8 +278,6 @@ class RpiTests(OESelftestTestCase): | |||
284 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) | 278 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) |
285 | if self.meta_rpi: | 279 | if self.meta_rpi: |
286 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_rpi, ignore_status=True) | 280 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_rpi, ignore_status=True) |
287 | if self.meta_python: | ||
288 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_python, ignore_status=True) | ||
289 | 281 | ||
290 | def test_rpi(self): | 282 | def test_rpi(self): |
291 | logger = logging.getLogger("selftest") | 283 | logger = logging.getLogger("selftest") |