summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-07-13 00:28:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-27 22:36:52 +0100
commitb9568cdd464c0417389a0c53f6bb9daa237dfebc (patch)
tree04894c28633f74eb0669e62a3c4e997c1b4662e2 /scripts
parentb8c208e8e83742805be6a3841fa8c1d465c8770d (diff)
downloadpoky-b9568cdd464c0417389a0c53f6bb9daa237dfebc.tar.gz
runqemu: check qbconfload before running bitbake
If qbconfload (.qemuboot.conf is found) is present, we can get DEPLOY_DIR_IMAGE from it rather than "bitbake -e". (From OE-Core rev: 89e97033a8a27a695567c321ed0ebf17f23f8d9b) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 7188bd7883..781814ae65 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -466,7 +466,7 @@ class BaseConfig(object):
466 466
467 self.check_arg_machine(unknown_arg) 467 self.check_arg_machine(unknown_arg)
468 468
469 if not self.get('DEPLOY_DIR_IMAGE'): 469 if not (self.get('DEPLOY_DIR_IMAGE') or self.qbconfload):
470 self.load_bitbake_env() 470 self.load_bitbake_env()
471 s = re.search('^DEPLOY_DIR_IMAGE="(.*)"', self.bitbake_e, re.M) 471 s = re.search('^DEPLOY_DIR_IMAGE="(.*)"', self.bitbake_e, re.M)
472 if s: 472 if s: