diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/testimage.bbclass | 1 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 8 |
3 files changed, 9 insertions, 2 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 4eef0be1d6..c83906d0f8 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -122,6 +122,7 @@ def testimage_main(d): qemu = QemuRunner(machine, rootfs) qemu.tmpdir = d.getVar("TMPDIR", True) + qemu.deploy_dir_image = d.getVar("DEPLOY_DIR_IMAGE", True) qemu.display = d.getVar("BB_ORIGENV", False).getVar("DISPLAY", True) qemu.logfile = os.path.join(testdir, "qemu_boot_log.%s" % d.getVar('DATETIME', True)) try: diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 578c7d00eb..9eed72ad3f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -379,7 +379,7 @@ DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk" DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm" DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" -DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images" +DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images/${MACHINE}" DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}" 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: |