diff options
| author | Laurent Bonnans <laurent.bonnans@here.com> | 2019-11-05 16:15:07 +0100 |
|---|---|---|
| committer | Patrick Vacek <patrickvacek@gmail.com> | 2019-11-20 10:42:55 +0100 |
| commit | 06eadcf5f8e11bf49c761b86fd50b8ddb6886fbb (patch) | |
| tree | 78e84b462e2435b52ce77b6190d701b00d6e2fe9 | |
| parent | 58817f08150cc434308dc19b6bd022480286207f (diff) | |
| download | meta-updater-06eadcf5f8e11bf49c761b86fd50b8ddb6886fbb.tar.gz | |
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 <laurent.bonnans@here.com>
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
| -rw-r--r-- | lib/oeqa/selftest/cases/updater_raspberrypi.py | 16 |
1 files changed, 0 insertions, 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): | |||
| 35 | else: | 35 | else: |
| 36 | self.meta_upd_rpi = None | 36 | self.meta_upd_rpi = None |
| 37 | 37 | ||
| 38 | # This is trickier that I would've thought. The fundamental problem is | ||
| 39 | # that the qemu layer changes the u-boot file extension to .rom, but | ||
| 40 | # raspberrypi still expects .bin. To prevent this, the qemu layer must | ||
| 41 | # be temporarily removed if it is present. It has to be removed by name | ||
| 42 | # without the complete path, but to add it back when we are done, we | ||
| 43 | # need the full path. | ||
| 44 | p = re.compile(r'meta-updater-qemux86-64\s*(\S*meta-updater-qemux86-64)\s') | ||
| 45 | m = p.search(result.output) | ||
| 46 | if m and m.lastindex > 0: | ||
| 47 | self.meta_qemu = m.group(1) | ||
| 48 | runCmd('bitbake-layers remove-layer meta-updater-qemux86-64') | ||
| 49 | else: | ||
| 50 | self.meta_qemu = None | ||
| 51 | |||
| 52 | self.append_config('MACHINE = "raspberrypi3"') | 38 | self.append_config('MACHINE = "raspberrypi3"') |
| 53 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') | 39 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') |
| 54 | 40 | ||
| 55 | def tearDownLocal(self): | 41 | def tearDownLocal(self): |
| 56 | if self.meta_qemu: | ||
| 57 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu, ignore_status=True) | ||
| 58 | if self.meta_upd_rpi: | 42 | if self.meta_upd_rpi: |
| 59 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) | 43 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) |
| 60 | if self.meta_rpi: | 44 | if self.meta_rpi: |
