diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-09-16 12:29:41 +0100 |
---|---|---|
committer | Robert Yang <liezhi.yang@windriver.com> | 2016-09-19 03:46:30 -0700 |
commit | a79ceace4b640abf574e25f991a30e8902935a2b (patch) | |
tree | 69692a5fe4fa99b8982c049f7252ff133847c026 | |
parent | df68ec80738689727adae5b7fbb7015510f88f0b (diff) | |
download | openembedded-core-contrib-a79ceace4b640abf574e25f991a30e8902935a2b.tar.gz |
runqemu: work even if a *.qemuboot.conf isn't found
A qemuboot conf file is a convenience but it should still be
possible to invoke runqemu without them, especially for examples
such as using the SDK with an extracted rootfs via NFS.
As read_qemuboot() is always called we need to be sure that function
can return cleanly, without throwing Exceptions, even if a qemuboot
conf file isn't found.
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
-rwxr-xr-x | scripts/runqemu | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 38f9b30567..10122af2c3 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -557,7 +557,8 @@ class BaseConfig(object): elif os.getenv('DEPLOY_DIR_IMAGE'): deploy_dir_image = os.getenv('DEPLOY_DIR_IMAGE') else: - raise OEPathError("DEPLOY_DIR_IMAGE is NULL!") + logger.info("Can't find qemuboot conf file, DEPLOY_DIR_IMAGE is NULL!") + return if self.rootfs and not os.path.exists(self.rootfs): # Lazy rootfs @@ -574,6 +575,11 @@ class BaseConfig(object): self.qemuboot = qbs.split()[0] self.qbconfload = True + if not self.qemuboot: + # If we haven't found a .qemuboot.conf at this point it probably + # doesn't exist, continue without + return + if not os.path.exists(self.qemuboot): raise Exception("Failed to find <image>.qemuboot.conf!") |