diff options
author | Laurent Bonnans <laurent.bonnans@here.com> | 2019-11-05 16:15:07 +0100 |
---|---|---|
committer | Laurent Bonnans <laurent.bonnans@here.com> | 2019-11-05 16:15:07 +0100 |
commit | e65911ad6c783dc22a2ec6fbf62586206601870c (patch) | |
tree | 4ad1f16298b0f8e435bbd8d003acc926cea81779 /lib/oeqa | |
parent | 22165a78b34583c1389c0c9c5841c5377bad6e10 (diff) | |
download | meta-updater-e65911ad6c783dc22a2ec6fbf62586206601870c.tar.gz |
Remove a now unnecessary hack in rpi oe-selftestsfix/unhack-rpi-oe
See https://github.com/advancedtelematic/meta-updater-qemux86-64/pull/37
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
Diffstat (limited to 'lib/oeqa')
-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 8efc941..fae631e 100644 --- a/lib/oeqa/selftest/cases/updater_raspberrypi.py +++ b/lib/oeqa/selftest/cases/updater_raspberrypi.py | |||
@@ -29,26 +29,10 @@ class RpiTests(OESelftestTestCase): | |||
29 | else: | 29 | else: |
30 | self.meta_upd_rpi = None | 30 | self.meta_upd_rpi = None |
31 | 31 | ||
32 | # This is trickier that I would've thought. The fundamental problem is | ||
33 | # that the qemu layer changes the u-boot file extension to .rom, but | ||
34 | # raspberrypi still expects .bin. To prevent this, the qemu layer must | ||
35 | # be temporarily removed if it is present. It has to be removed by name | ||
36 | # without the complete path, but to add it back when we are done, we | ||
37 | # need the full path. | ||
38 | p = re.compile(r'meta-updater-qemux86-64\s*(\S*meta-updater-qemux86-64)\s') | ||
39 | m = p.search(result.output) | ||
40 | if m and m.lastindex > 0: | ||
41 | self.meta_qemu = m.group(1) | ||
42 | runCmd('bitbake-layers remove-layer meta-updater-qemux86-64') | ||
43 | else: | ||
44 | self.meta_qemu = None | ||
45 | |||
46 | self.append_config('MACHINE = "raspberrypi3"') | 32 | self.append_config('MACHINE = "raspberrypi3"') |
47 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') | 33 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') |
48 | 34 | ||
49 | def tearDownLocal(self): | 35 | def tearDownLocal(self): |
50 | if self.meta_qemu: | ||
51 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu, ignore_status=True) | ||
52 | if self.meta_upd_rpi: | 36 | if self.meta_upd_rpi: |
53 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) | 37 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) |
54 | if self.meta_rpi: | 38 | if self.meta_rpi: |