summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-26 08:57:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-26 14:33:57 +0100
commitee98c6ab03a9fa82141543d8081ebf3c1d0fa7e2 (patch)
treee1e8d97ca2f5e147c54c00dd99cc641bd4763e6d /scripts
parent5713f5d7c8a2b7819388a868696ca27f3201077a (diff)
downloadpoky-ee98c6ab03a9fa82141543d8081ebf3c1d0fa7e2.tar.gz
poky-ee98c6ab03a9fa82141543d8081ebf3c1d0fa7e2.tar.bz2
poky-ee98c6ab03a9fa82141543d8081ebf3c1d0fa7e2.zip
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. (From OE-Core rev: 377a6ffbcba0d3c5ede470c989756c4d1636873f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 7fb5f7db57..c71f3c4df5 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -456,6 +456,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':