From 06eadcf5f8e11bf49c761b86fd50b8ddb6886fbb Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Tue, 5 Nov 2019 16:15:07 +0100 Subject: Remove a now unnecessary hack in rpi oe-selftests See https://github.com/advancedtelematic/meta-updater-qemux86-64/pull/37 Signed-off-by: Laurent Bonnans Signed-off-by: Patrick Vacek --- lib/oeqa/selftest/cases/updater_raspberrypi.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lib/oeqa/selftest/cases/updater_raspberrypi.py b/lib/oeqa/selftest/cases/updater_raspberrypi.py index 26d5c4c..25c5f12 100644 --- a/lib/oeqa/selftest/cases/updater_raspberrypi.py +++ b/lib/oeqa/selftest/cases/updater_raspberrypi.py @@ -35,26 +35,10 @@ class RpiTests(OESelftestTestCase): else: self.meta_upd_rpi = None - # This is trickier that I would've thought. The fundamental problem is - # that the qemu layer changes the u-boot file extension to .rom, but - # raspberrypi still expects .bin. To prevent this, the qemu layer must - # be temporarily removed if it is present. It has to be removed by name - # without the complete path, but to add it back when we are done, we - # need the full path. - p = re.compile(r'meta-updater-qemux86-64\s*(\S*meta-updater-qemux86-64)\s') - m = p.search(result.output) - if m and m.lastindex > 0: - self.meta_qemu = m.group(1) - runCmd('bitbake-layers remove-layer meta-updater-qemux86-64') - else: - self.meta_qemu = None - self.append_config('MACHINE = "raspberrypi3"') self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') def tearDownLocal(self): - if self.meta_qemu: - runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu, ignore_status=True) if self.meta_upd_rpi: runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) if self.meta_rpi: -- cgit v1.2.3-54-g00ecf