MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

oeqa/controllers: update for MasterImageHardwareTarget->Controller...

Browse Source 
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>
This commit is contained in:
Ross Burton 2022-02-22 16:58:11 +00:00 committed by Richard Purdie
parent d418a495bb
commit 18f40dfdfd
3 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
View File

@ -24,11 +24,10 @@ import subprocess
import sys import sys
import pexpect import pexpect
import oeqa.utils.sshcontrol as sshcontrol from oeqa.controllers.controllerimage import ControllerImageHardwareTarget
from oeqa.controllers.masterimage import MasterImageHardwareTarget
class BeagleBoneTarget(MasterImageHardwareTarget): class BeagleBoneTarget(ControllerImageHardwareTarget):
dtbs = {'uImage-am335x-bone.dtb': 'am335x-bone.dtb', 'uImage-am335x-boneblack.dtb': 'am335x-boneblack.dtb'} dtbs = {'uImage-am335x-bone.dtb': 'am335x-bone.dtb', 'uImage-am335x-boneblack.dtb': 'am335x-boneblack.dtb'}
@ -57,21 +56,21 @@ class BeagleBoneTarget(MasterImageHardwareTarget):
def _deploy(self): def _deploy(self):
self.master.run("umount /boot; umount /mnt/testrootfs;") self.controller.run("umount /boot; umount /mnt/testrootfs;")
self.master.ignore_status = False self.controller.ignore_status = False
# Kernel and dtb files may not be in the image, so copy them just in case # Kernel and dtb files may not be in the image, so copy them just in case
self.master.copy_to(self.kernel, "~/test-kernel") self.controller.copy_to(self.kernel, "~/test-kernel")
kernelpath = os.path.dirname(self.kernel) kernelpath = os.path.dirname(self.kernel)
for dtborig, dtbfn in self.dtbs.iteritems(): for dtborig, dtbfn in self.dtbs.iteritems():
dtbfile = os.path.join(kernelpath, dtborig) dtbfile = os.path.join(kernelpath, dtborig)
if os.path.exists(dtbfile): if os.path.exists(dtbfile):
self.master.copy_to(dtbfile, "~/%s" % dtbfn) self.controller.copy_to(dtbfile, "~/%s" % dtbfn)
self.master.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype) self.controller.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype)
for cmd in self.deploy_cmds: for cmd in self.deploy_cmds:
self.master.run(cmd) self.controller.run(cmd)
def _start(self, params=None): def _start(self, params=None):
self.power_cycle(self.master) self.power_cycle(self.controller)
try: try:
serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout) serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout)
# We'd wait for "U-Boot" here but sometimes we connect too late on BeagleBone white to see it # We'd wait for "U-Boot" here but sometimes we connect too late on BeagleBone white to see it

17
meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py
View File

@ -35,11 +35,10 @@ import subprocess
import sys import sys
import pexpect import pexpect
import oeqa.utils.sshcontrol as sshcontrol from oeqa.controllers.controllerimage import ControllerImageHardwareTarget
from oeqa.controllers.masterimage import MasterImageHardwareTarget
class EdgeRouterTarget(MasterImageHardwareTarget): class EdgeRouterTarget(ControllerImageHardwareTarget):
def __init__(self, d): def __init__(self, d):
super(EdgeRouterTarget, self).__init__(d) super(EdgeRouterTarget, self).__init__(d)
@ -58,15 +57,15 @@ class EdgeRouterTarget(MasterImageHardwareTarget):
def _deploy(self): def _deploy(self):
self.master.run("umount /mnt/testrootfs;") self.controller.run("umount /mnt/testrootfs;")
self.master.ignore_status = False self.controller.ignore_status = False
self.master.copy_to(self.kernel, "~/test-kernel") self.controller.copy_to(self.kernel, "~/test-kernel")
self.master.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype) self.controller.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype)
for cmd in self.deploy_cmds: for cmd in self.deploy_cmds:
self.master.run(cmd) self.controller.run(cmd)
def _start(self, params=None): def _start(self, params=None):
self.power_cycle(self.master) self.power_cycle(self.controller)
try: try:
serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout) serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout)
serialconn.expect("U-Boot") serialconn.expect("U-Boot")

17
meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
View File

@ -19,10 +19,9 @@ import subprocess
import sys import sys
import pexpect import pexpect
import oeqa.utils.sshcontrol as sshcontrol from oeqa.controllers.controllerimage import ControllerImageHardwareTarget
from oeqa.controllers.masterimage import MasterImageHardwareTarget
class GrubTarget(MasterImageHardwareTarget): class GrubTarget(ControllerImageHardwareTarget):
def __init__(self, d): def __init__(self, d):
super(GrubTarget, self).__init__(d) super(GrubTarget, self).__init__(d)
@ -41,16 +40,16 @@ class GrubTarget(MasterImageHardwareTarget):
def _deploy(self): def _deploy(self):
# make sure these aren't mounted # make sure these aren't mounted
self.master.run("umount /boot; umount /mnt/testrootfs;") self.controller.run("umount /boot; umount /mnt/testrootfs;")
self.master.ignore_status = False self.controller.ignore_status = False
# Kernel files may not be in the image, so copy them just in case # Kernel files may not be in the image, so copy them just in case
self.master.copy_to(self.rootfs, "~/test-rootfs." + self.image_fstype) self.controller.copy_to(self.rootfs, "~/test-rootfs." + self.image_fstype)
self.master.copy_to(self.kernel, "~/test-kernel") self.controller.copy_to(self.kernel, "~/test-kernel")
for cmd in self.deploy_cmds: for cmd in self.deploy_cmds:
self.master.run(cmd) self.controller.run(cmd)
def _start(self, params=None): def _start(self, params=None):
self.power_cycle(self.master) self.power_cycle(self.controller)
try: try:
serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout) serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout)
serialconn.expect("GNU GRUB version 2.00") serialconn.expect("GNU GRUB version 2.00")