From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 12/13] runqemu: do not check for GL libraries
Date: Fri, 1 Feb 2019 14:05:53 +0100 [thread overview]
Message-ID: <20190201130554.90094-12-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20190201130554.90094-1-alex.kanavin@gmail.com>
qemu has been using libepoxy for a long time, and libepoxy loads GL via dlopen()
only when instructed to.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
scripts/runqemu | 35 -----------------------------------
1 file changed, 35 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 50888a532e8..586f8700c94 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -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:
@@ -1178,8 +1145,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:
--
2.17.1
next prev parent reply other threads:[~2019-02-01 13:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-01 13:05 [PATCH 01/13] virglrenderer: add a recipe Alexander Kanavin
2019-02-01 13:05 ` [PATCH 02/13] qemu: enable virglrenderer and glx options for native/nativesdk builds Alexander Kanavin
2019-02-01 13:05 ` [PATCH 03/13] qemu: drop --with-gtkabi option, as it is no longer supported Alexander Kanavin
2019-02-01 13:05 ` [PATCH 04/13] local.conf.sample: adjust the qemu config to enable gtk+ instead of sdl Alexander Kanavin
2019-02-01 13:05 ` [PATCH 05/13] qemu: build target variant with gtk+, and nativesdk variant without sdl Alexander Kanavin
2019-02-01 13:05 ` [PATCH 06/13] qemu: remove support for building against host sdl Alexander Kanavin
2019-02-01 13:05 ` [PATCH 07/13] qemu: add a gettext-native dependency to gtk option Alexander Kanavin
2019-02-01 13:05 ` [PATCH 08/13] qemu: add a patch to avoid a missing definition error Alexander Kanavin
2019-02-01 13:05 ` [PATCH 09/13] qemu: add environment variable wrappers to make qemu look good with gtk frontend Alexander Kanavin
2019-02-01 13:05 ` [PATCH 10/13] qemu: add a backported patch to fix egl-headless support Alexander Kanavin
2019-02-01 13:05 ` [PATCH 11/13] runqemu: add options for enabling virgl GL acceleration Alexander Kanavin
2019-02-01 13:05 ` Alexander Kanavin [this message]
2019-02-01 13:05 ` [PATCH 13/13] selftest: add tests for " Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190201130554.90094-12-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox