summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-07-13 01:09:34 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-27 22:36:52 +0100
commit5c7d025ced2120e4f277b8fb22813a8602e3f8c7 (patch)
tree80b5c31ca4d31be66301b0b440b1a4e0ead82106
parent0420171c087f9ed9cb9ead802573998ae936cd03 (diff)
downloadpoky-5c7d025ced2120e4f277b8fb22813a8602e3f8c7.tar.gz
runqemu: validate combos
Error out ealier if the combos is invalid, e.g.: $ runqemu tmp/deploy/images/qemux86/bzImage-qemux86.bin tmp/deploy/images/qemux86/core-image-minimal-qemux86.wic This will fail at kernel panic, no we check and error out early. We can add other checkings in the future. [YOCTO #11286] (From OE-Core rev: 8c6f253dfb4899324e91dd5d082190909e2bd25d) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index bdb559f82f..5f2b38febc 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1209,6 +1209,10 @@ class BaseConfig(object):
1209 self.bitbake_e = '' 1209 self.bitbake_e = ''
1210 logger.warn("Couldn't run 'bitbake -e' to gather environment information:\n%s" % err.output.decode('utf-8')) 1210 logger.warn("Couldn't run 'bitbake -e' to gather environment information:\n%s" % err.output.decode('utf-8'))
1211 1211
1212 def validate_combos(self):
1213 if (self.fstype in self.vmtypes) and self.kernel:
1214 raise RunQemuError("%s doesn't need kernel %s!" % (self.fstype, self.kernel))
1215
1212 @property 1216 @property
1213 def bindir_native(self): 1217 def bindir_native(self):
1214 result = self.get('STAGING_BINDIR_NATIVE') 1218 result = self.get('STAGING_BINDIR_NATIVE')
@@ -1240,6 +1244,8 @@ def main():
1240 config.check_args() 1244 config.check_args()
1241 config.read_qemuboot() 1245 config.read_qemuboot()
1242 config.check_and_set() 1246 config.check_and_set()
1247 # Check whether the combos is valid or not
1248 config.validate_combos()
1243 config.print_config() 1249 config.print_config()
1244 config.setup_network() 1250 config.setup_network()
1245 config.setup_rootfs() 1251 config.setup_rootfs()