summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-26 08:57:50 +0100
committerSteve Sakoman <steve@sakoman.com>2020-08-29 07:18:47 -1000
commite62c8207fa47ff4e325529ea84e0d51710deaa3c (patch)
tree65ebc25e533f452d45693b258813395270f07d6b /scripts
parentb1fa60c791e759f7171862db68dbad2687e83812 (diff)
downloadopenembedded-core-contrib-e62c8207fa47ff4e325529ea84e0d51710deaa3c.tar.gz
runqemu: Show an error for conflicting graphics options
The autobuilder managed to pass the nographic option with "sdl gl" due to a problem elsewhere. It would have been useful for runqemu to have errored rather than passing conflicting options to qemu. Add an error for this invalid usecase. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 377a6ffbcba0d3c5ede470c989756c4d1636873f) Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 398f0a0910..b24ac1c804 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -436,6 +436,10 @@ class BaseConfig(object):
if arg in self.fstypes + self.vmtypes + self.wictypes:
self.check_arg_fstype(arg)
elif arg == 'nographic':
+ if ('sdl' in sys.argv):
+ raise RunQemuError('Option nographic makes no sense alongside the sdl option.' % (arg))
+ if ('gtk' in sys.argv):
+ raise RunQemuError('Option nographic makes no sense alongside the gtk option.' % (arg))
self.qemu_opt_script += ' -nographic'
self.kernel_cmdline_script += ' console=ttyS0'
elif arg == 'sdl':