diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-26 08:57:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-02 16:04:37 +0100 |
commit | 855413987118bd3710c3aca7af8fe2c09c64c8ae (patch) | |
tree | db7e069519bcf3e541f839aa6828992ec6ea7eff /scripts/runqemu | |
parent | ab50d533feb9ed81b64af417c14a410bc7b177aa (diff) | |
download | poky-855413987118bd3710c3aca7af8fe2c09c64c8ae.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.
(From OE-Core rev: e62c8207fa47ff4e325529ea84e0d51710deaa3c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 377a6ffbcba0d3c5ede470c989756c4d1636873f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-x | scripts/runqemu | 4 |
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): | |||
436 | if arg in self.fstypes + self.vmtypes + self.wictypes: | 436 | if arg in self.fstypes + self.vmtypes + self.wictypes: |
437 | self.check_arg_fstype(arg) | 437 | self.check_arg_fstype(arg) |
438 | elif arg == 'nographic': | 438 | elif arg == 'nographic': |
439 | if ('sdl' in sys.argv): | ||
440 | raise RunQemuError('Option nographic makes no sense alongside the sdl option.' % (arg)) | ||
441 | if ('gtk' in sys.argv): | ||
442 | raise RunQemuError('Option nographic makes no sense alongside the gtk option.' % (arg)) | ||
439 | self.qemu_opt_script += ' -nographic' | 443 | self.qemu_opt_script += ' -nographic' |
440 | self.kernel_cmdline_script += ' console=ttyS0' | 444 | self.kernel_cmdline_script += ' console=ttyS0' |
441 | elif arg == 'sdl': | 445 | elif arg == 'sdl': |