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

runqemu: do not check for GL libraries

Browse Source 
qemu has been using libepoxy for a long time, and libepoxy loads GL via dlopen()
only when instructed to.

(From OE-Core rev: d974e0e9a290d66b702e5ca1d01873282763437b)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2019-02-22 15:33:46 +01:00 committed by Richard Purdie
parent b253fcb592
commit c39f1d1507
1 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
scripts/runqemu
View File

@ -118,39 +118,6 @@ def check_tun():
if not os.access(dev_tun, os.W_OK):
raise RunQemuError("TUN control device %s is not writable, please fix (e.g. sudo chmod 666 %s)" % (dev_tun, dev_tun))
def check_libgl(qemu_bin):
cmd = ('ldd', qemu_bin)
logger.debug('Running %s...' % str(cmd))
need_gl = subprocess.check_output(cmd).decode('utf-8')
if re.search('libGLU', need_gl):
# We can't run without a libGL.so
libgl = False
check_files = (('/usr/lib/libGL.so', '/usr/lib/libGLU.so'), \
('/usr/lib64/libGL.so', '/usr/lib64/libGLU.so'), \
('/usr/lib/*-linux-gnu/libGL.so', '/usr/lib/*-linux-gnu/libGLU.so'))
for (f1, f2) in check_files:
if re.search('\*', f1):
for g1 in glob.glob(f1):
if libgl:
break
if os.path.exists(g1):
for g2 in glob.glob(f2):
if os.path.exists(g2):
libgl = True
break
if libgl:
break
else:
if os.path.exists(f1) and os.path.exists(f2):
libgl = True
break
if not libgl:
logger.error("You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.")
logger.error("Ubuntu package names are: libgl1-mesa-dev and libglu1-mesa-dev.")
logger.error("Fedora package names are: mesa-libGL-devel mesa-libGLU-devel.")
raise RunQemuError('%s requires libGLU, but not found' % qemu_bin)
def get_first_file(cmds):
"""Return first file found in wildcard cmds"""
for cmd in cmds:
@ -1194,8 +1161,6 @@ class BaseConfig(object):
if not os.access(qemu_bin, os.X_OK):
raise OEPathError("No QEMU binary '%s' could be found" % qemu_bin)
check_libgl(qemu_bin)
self.qemu_opt = "%s %s %s %s" % (qemu_bin, self.get('NETWORK_CMD'), self.get('ROOTFS_OPTIONS'), self.get('QB_OPT_APPEND'))
for ovmf in self.ovmf_bios: