MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

runqemu: Do not auto detect graphics if publicvnc is specified

Browse Source 
The graphics option auto detection logic added in 7f78bb7a was not
checking if the publicvnc option had been specified, meaning that
it would be ignored and the auto detection result used instead.
Add setting a flag variable in the argument parsing and check
it along with the ones for the other graphics backend options.

(From OE-Core rev: 4b73b55c2d258768cda2bf7262ebb36bcb7fed5b)

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Murray 2022-04-14 19:37:10 -04:00 committed by Richard Purdie
parent 24c743fe66
commit d3f246413b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/runqemu
View File

@ -182,6 +182,7 @@ class BaseConfig(object):
self.gl = False
self.gl_es = False
self.egl_headless = False
self.publicvnc = False
self.novga = False
self.cleantap = False
self.saved_stty = ''
@ -521,6 +522,7 @@ class BaseConfig(object):
elif arg == 'snapshot':
self.snapshot = True
elif arg == 'publicvnc':
self.publicvnc = True
self.qemu_opt_script += ' -vnc :0'
elif arg.startswith('tcpserial='):
self.tcpserial_portnum = '%s' % arg[len('tcpserial='):]
@ -1366,7 +1368,7 @@ class BaseConfig(object):
# If we have no display option, we autodetect based upon what qemu supports. We
# need our font setup and show-cusor below so we need to see what qemu --help says
# is supported so we can pass our correct config in.
if not self.nographic and not self.sdl and not self.gtk and not self.egl_headless == True:
if not self.nographic and not self.sdl and not self.gtk and not self.publicvnc and not self.egl_headless == True:
output = subprocess.check_output([self.qemu_bin, "--help"], universal_newlines=True)
if "-display gtk" in output:
self.gtk = True