summaryrefslogtreecommitdiffstats
path: root/meta/classes/qemuboot.bbclass
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2022-02-04 20:59:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-07 10:08:59 +0000
commit0f82f85dc9f8caf1fbf08af24ee98cbd5b5668a0 (patch)
tree9808d1f6d8c149a2a8393ce23357d5fcdc8b02b1 /meta/classes/qemuboot.bbclass
parent276975e4ea78691d092ddcca50098ed177357a74 (diff)
downloadpoky-0f82f85dc9f8caf1fbf08af24ee98cbd5b5668a0.tar.gz
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 <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/qemuboot.bbclass')
-rw-r--r--meta/classes/qemuboot.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
index cc1cbce69d..229bd88527 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -109,7 +109,7 @@ def qemuboot_vars(d):
109 build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE', 109 build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE',
110 'KERNEL_IMAGETYPE', 'IMAGE_NAME', 'IMAGE_LINK_NAME', 110 'KERNEL_IMAGETYPE', 'IMAGE_NAME', 'IMAGE_LINK_NAME',
111 'STAGING_DIR_NATIVE', 'STAGING_BINDIR_NATIVE', 111 'STAGING_DIR_NATIVE', 'STAGING_BINDIR_NATIVE',
112 'STAGING_DIR_HOST', 'SERIAL_CONSOLES'] 112 'STAGING_DIR_HOST', 'SERIAL_CONSOLES', 'UNINATIVE_LOADER']
113 return build_vars + [k for k in d.keys() if k.startswith('QB_')] 113 return build_vars + [k for k in d.keys() if k.startswith('QB_')]
114 114
115do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}" 115do_write_qemuboot_conf[vardeps] += "${@' '.join(qemuboot_vars(d))}"