From 7e90261aec61f79680b5eaeaf5b18c7b795412a4 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 12 Sep 2013 12:04:52 +0100 Subject: bitbake.conf: include machine name in DEPLOY_DIR_IMAGE This allows a clean seperation between image outputs from different machines, and makes it possible to have convenience symlinks to make the output ready to deploy. This did require some surgery in runqemu; if explicit paths to the image and kernel are not supplied then DEPLOY_DIR_IMAGE needs to be determined from bitbake or set in the environment. However the script does try to avoid requiring it unless it really is needed. Corresponding changes were made in the automated testing code as well. Based on an RFC patch by Koen Kooi Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/qemurunner.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'meta/lib/oeqa/utils') diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index b5c757a927..d362edeecb 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -16,7 +16,7 @@ import bb class QemuRunner: - def __init__(self, machine, rootfs, display = None, tmpdir = None, logfile = None, boottime = 400, runqemutime = 60): + def __init__(self, machine, rootfs, display = None, tmpdir = None, deploy_dir_image = None, logfile = None, boottime = 400, runqemutime = 60): # Popen object self.runqemu = None @@ -28,6 +28,7 @@ class QemuRunner: self.display = display self.tmpdir = tmpdir + self.deploy_dir_image = deploy_dir_image self.logfile = logfile self.boottime = boottime self.runqemutime = runqemutime @@ -71,6 +72,11 @@ class QemuRunner: return False else: os.environ["OE_TMPDIR"] = self.tmpdir + if not os.path.exists(self.deploy_dir_image): + bb.error("Invalid DEPLOY_DIR_IMAGE path %s" % self.deploy_dir_image) + return False + else: + os.environ["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image self.qemuparams = 'bootparams="console=tty1 console=ttyS0,115200n8" qemuparams="-serial tcp:127.0.0.1:%s"' % self.serverport if qemuparams: -- cgit v1.2.3