zepto-mirrors/meta-zephyr
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-zephyr synced 2026-01-29 21:58:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

qemuzephyrrunner.py: add tmpfsdir support

Browse Source 
OE-Core rev: fd1c26ab426c3699ffd8082b83d65a84c8eb8bff added an
additional parameter, tmpfsdir, to the API.  This caused testimage to no
longer work in meta-zephyr.  Add that parameter and everything is happy
now.

Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
This commit is contained in:
Jon Mason
2021-04-25 18:07:41 -04:00
committed by Naveen Saini
parent a82c9a569e
commit f4fbef5d83
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/oeqa/controllers/zephyrtargetcontrol.py
View File

@@ -14,8 +14,8 @@ class QemuTargetZephyr(OETarget):
def __init__(self, logger, ip, server_ip,
machine='', rootfs='', tmpdir ='',dir_image ='',display=None,
kernel='',boottime=60,bootlog='',kvm=False,slirp=False,
dump_dir='',serial_ports=0,ovmf=None,target_modules_path='',powercontrol_cmd='',powercontrol_extra_args='',
serialcontrol_cmd=None,serialcontrol_extra_args='',testimage_dump_target='' ):
dump_dir='',serial_ports=0,ovmf=None,tmpfsdir='' ,target_modules_path='',powercontrol_cmd='',powercontrol_extra_args='',
serialcontrol_cmd=None,serialcontrol_extra_args='',testimage_dump_target=''):
timeout = 300
user = 'root'
@@ -48,7 +48,7 @@ class QemuTargetZephyr(OETarget):
logfile=self.qemulog, boottime=boottime,
use_kvm=kvm, dump_dir=dump_dir,
dump_host_cmds=dump_host_cmds,
logger = logger)
logger = logger, tmpfsdir=tmpfsdir)
def start(self, params=None, runqemuparams=None, extra_bootparams=None):

8
lib/oeqa/utils/qemuzephyrrunner.py
View File

@@ -18,11 +18,12 @@ from oeqa.utils.qemurunner import QemuRunner
class QemuZephyrRunner(QemuRunner):
def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, boottime, dump_dir, dump_host_cmds, use_kvm, logger):
def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, boottime, dump_dir, dump_host_cmds, use_kvm, logger, tmpfsdir):
QemuRunner.__init__(self, machine, rootfs, display, tmpdir,
deploy_dir_image, logfile, boottime, None,
None, use_kvm, logger)
None, use_kvm, logger, tmpfsdir)
# Popen object for runqemu
self.socketfile = tempfile.NamedTemporaryFile()
@@ -32,6 +33,7 @@ class QemuZephyrRunner(QemuRunner):
self.kernel = rootfs
self.deploy_dir_image = deploy_dir_image
self.tmpfsdir = tmpfsdir
self.logfile = logfile
self.use_kvm = use_kvm
@@ -73,6 +75,8 @@ class QemuZephyrRunner(QemuRunner):
return False
else:
os.environ["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image
if self.tmpfsdir:
env["RUNQEMU_TMPFS_DIR"] = self.tmpfsdir
if not os.path.exists(self.kernel):
bb.error("Invalid kernel path: %s" % self.kernel)