With mesa 23.0, it is not longer possible to use the host drivers, as
mesa upstream has added strict checks for matching builds between
drivers and libraries that load them.
Signed-off-by: Alexander Kanavin <a...@linutronix.de>
---
scripts/runqemu | 25 +------------------------
1 file changed, 1 insertion(+), 24 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 58b0c191e1..8e915f3d4c 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -447,30 +447,7 @@ class BaseConfig(object):
self.set("MACHINE", arg)
def set_dri_path(self):
- # As runqemu can be run within bitbake (when using testimage, for
example),
- # we need to ensure that we run host pkg-config, and that it does not
- # get mis-directed to native build paths set by bitbake.
- env = os.environ.copy()
- try:
- del env['PKG_CONFIG_PATH']
- del env['PKG_CONFIG_DIR']
- del env['PKG_CONFIG_LIBDIR']
- del env['PKG_CONFIG_SYSROOT_DIR']
- except KeyError:
- pass
- try:
- dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH
pkg-config --variable=dridriverdir dri", shell=True, env=env)
- except subprocess.CalledProcessError as e:
- raise RunQemuError("Could not determine the path to dri drivers on
the host via pkg-config.\nPlease install Mesa development files (particularly,
dri.pc) on the host machine.")
- self.qemu_environ['LIBGL_DRIVERS_PATH'] =
dripath.decode('utf-8').strip()
-
- # This preloads uninative libc pieces and therefore ensures that
RPATH/RUNPATH
- # in host mesa drivers doesn't trick uninative into loading host libc.
- preload_items = ['libdl.so.2', 'librt.so.1', 'libpthread.so.0']
- uninative_path = os.path.dirname(self.get("UNINATIVE_LOADER"))
- if os.path.exists(uninative_path):
- preload_paths = [os.path.join(uninative_path, i) for i in
preload_items]
- self.qemu_environ['LD_PRELOAD'] = " ".join(preload_paths)
+ self.qemu_environ['LIBGL_DRIVERS_PATH'] =
os.path.join(self.bindir_native, '../lib/dri')
def check_args(self):
for debug in ("-d", "--debug"):
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#178190):
https://lists.openembedded.org/g/openembedded-core/message/178190
Mute This Topic: https://lists.openembedded.org/mt/97480125/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
