aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-09-21 20:35:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-21 21:59:14 +0100
commite843b2d49a151c1fe0d2a7ba00c41d2a35775736 (patch)
tree88171047336954868be49c722db3afb6ba03d31b
parentb475bb88cc5d6700b4fadff1b2bb43a376492c7b (diff)
downloadopenembedded-core-contrib-e843b2d49a151c1fe0d2a7ba00c41d2a35775736.tar.gz
openembedded-core-contrib-e843b2d49a151c1fe0d2a7ba00c41d2a35775736.tar.bz2
openembedded-core-contrib-e843b2d49a151c1fe0d2a7ba00c41d2a35775736.zip
runqemu: validate paths and attempt to infer unset paths
We need to validate and ensure all paths are set regardless of whether runqemu was invoked with a .qemuboot.conf file or otherwise. Split this logic out into a separate method called during check_and_set() Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 08dc3069214..5170d875707 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -536,6 +536,7 @@ class BaseConfig(object):
def check_and_set(self):
"""Check configs sanity and set when needed"""
+ self.validate_paths()
check_tun()
# Check audio
if self.audio_enabled:
@@ -598,6 +599,8 @@ class BaseConfig(object):
k_upper = k.upper()
self.set(k_upper, v)
+ def validate_paths(self):
+ """Ensure all relevant path variables are set"""
# When we're started with a *.qemuboot.conf arg assume that image
# artefacts are relative to that file, rather than in whatever
# directory DEPLOY_DIR_IMAGE in the conf file points to.