diff options
author | Ross Burton <ross@burtonini.com> | 2022-02-22 16:58:11 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-25 12:41:48 +0000 |
commit | 18f40dfdfd81d0a08ad31fbe33815477190fa1b6 (patch) | |
tree | 793009dc086dffd721d91c6d174899945c221b0d /meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py | |
parent | d418a495bbdee395c8c38191847a19c3256c2a72 (diff) | |
download | poky-18f40dfdfd81d0a08ad31fbe33815477190fa1b6.tar.gz |
oeqa/controllers: update for MasterImageHardwareTarget->Controller...
oe-core f87b328 renamed MasterImageHardwareTarget to
ControllerImageHardwareTarget, but these files were left out of the
updates.
(From meta-yocto rev: 8e578551e14e90da20701bb8a9598e2bb25f74e6)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py')
-rw-r--r-- | meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py b/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py index 9c47b5b044..e31670db48 100644 --- a/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py +++ b/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py | |||
@@ -35,11 +35,10 @@ import subprocess | |||
35 | import sys | 35 | import sys |
36 | import pexpect | 36 | import pexpect |
37 | 37 | ||
38 | import oeqa.utils.sshcontrol as sshcontrol | 38 | from oeqa.controllers.controllerimage import ControllerImageHardwareTarget |
39 | from oeqa.controllers.masterimage import MasterImageHardwareTarget | ||
40 | 39 | ||
41 | 40 | ||
42 | class EdgeRouterTarget(MasterImageHardwareTarget): | 41 | class EdgeRouterTarget(ControllerImageHardwareTarget): |
43 | 42 | ||
44 | def __init__(self, d): | 43 | def __init__(self, d): |
45 | super(EdgeRouterTarget, self).__init__(d) | 44 | super(EdgeRouterTarget, self).__init__(d) |
@@ -58,15 +57,15 @@ class EdgeRouterTarget(MasterImageHardwareTarget): | |||
58 | 57 | ||
59 | 58 | ||
60 | def _deploy(self): | 59 | def _deploy(self): |
61 | self.master.run("umount /mnt/testrootfs;") | 60 | self.controller.run("umount /mnt/testrootfs;") |
62 | self.master.ignore_status = False | 61 | self.controller.ignore_status = False |
63 | self.master.copy_to(self.kernel, "~/test-kernel") | 62 | self.controller.copy_to(self.kernel, "~/test-kernel") |
64 | self.master.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype) | 63 | self.controller.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype) |
65 | for cmd in self.deploy_cmds: | 64 | for cmd in self.deploy_cmds: |
66 | self.master.run(cmd) | 65 | self.controller.run(cmd) |
67 | 66 | ||
68 | def _start(self, params=None): | 67 | def _start(self, params=None): |
69 | self.power_cycle(self.master) | 68 | self.power_cycle(self.controller) |
70 | try: | 69 | try: |
71 | serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout) | 70 | serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout) |
72 | serialconn.expect("U-Boot") | 71 | serialconn.expect("U-Boot") |