From 0f82f85dc9f8caf1fbf08af24ee98cbd5b5668a0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 4 Feb 2022 20:59:43 +0100 Subject: runqemu: preload uninative libraries when host gl drivers are in use Some of the host distributions build the drivers in a way (RPATH/RUNPATH) that tricks uninative loader into loading pieces of the host libc, if the same pieces haven't been previously loaded by native binaries. Mixing the two libc versions leads to failures. This change ensures that the correct (uninative) versions are always in use. (From OE-Core rev: 39c10816d5ec9d9c7952d786d7a3f942d25d0c27) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- scripts/runqemu | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'scripts') diff --git a/scripts/runqemu b/scripts/runqemu index 07429372ea..5c108ec23a 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -461,6 +461,14 @@ class BaseConfig(object): 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.") os.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] + os.environ['LD_PRELOAD'] = " ".join(preload_paths) + def check_args(self): for debug in ("-d", "--debug"): if debug in sys.argv: -- cgit v1.2.3-54-g00ecf