mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

runqemu: Do not perturb script environment

Browse Source 
Instead of changing the script environment to affect the child
processes, make a copy of the environment with modifications and pass
that to subprocess.

Specifically, when dri rendering is enabled, LD_PRELOAD was being passed
to all processes created by the script which resulted in other commands
(e.g. stty) exiting with a failure like:

 /bin/sh: symbol lookup error: sysroots-uninative/x86_64-linux/lib/librt.so.1: undefined symbol: __libc_unwind_link_get, version GLIBC_PRIVATE

Making a copy of the environment fixes this because the LD_PRELOAD is
now only passed to qemu itself.

(From OE-Core rev: 74911cf7ea703c54920a6c58c344a22a46398b02)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 2232599d330bd5f2a9e206b490196569ad855de8)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt
2022-10-21 14:23:44 -05:00
committed by Richard Purdie
parent f2adbff03d
commit b9f2ebe163
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/runqemu
+14 -12
View File
@@ -210,6 +210,7 @@ class BaseConfig(object):
self.mac_tap = "52:54:00:12:34:" self.mac_tap = "52:54:00:12:34:"
self.mac_slirp = "52:54:00:12:35:" self.mac_slirp = "52:54:00:12:35:"
# pid of the actual qemu process # pid of the actual qemu process
self.qemu_environ = os.environ.copy()
self.qemupid = None self.qemupid = None
# avoid cleanup twice # avoid cleanup twice
self.cleaned = False self.cleaned = False
@@ -449,18 +450,19 @@ class BaseConfig(object):
# As runqemu can be run within bitbake (when using testimage, for example), # 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 # 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. # get mis-directed to native build paths set by bitbake.
env = os.environ.copy()
try: try:
del os.environ['PKG_CONFIG_PATH'] del env['PKG_CONFIG_PATH']
del os.environ['PKG_CONFIG_DIR'] del env['PKG_CONFIG_DIR']
del os.environ['PKG_CONFIG_LIBDIR'] del env['PKG_CONFIG_LIBDIR']
del os.environ['PKG_CONFIG_SYSROOT_DIR'] del env['PKG_CONFIG_SYSROOT_DIR']
except KeyError: except KeyError:
pass pass
try: try:
dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH pkg-config --variable=dridriverdir dri", shell=True) dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH pkg-config --variable=dridriverdir dri", shell=True, env=env)
except subprocess.CalledProcessError as e: 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.") 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() self.qemu_environ['LIBGL_DRIVERS_PATH'] = dripath.decode('utf-8').strip()
# This preloads uninative libc pieces and therefore ensures that RPATH/RUNPATH # This preloads uninative libc pieces and therefore ensures that RPATH/RUNPATH
# in host mesa drivers doesn't trick uninative into loading host libc. # in host mesa drivers doesn't trick uninative into loading host libc.
@@ -468,7 +470,7 @@ class BaseConfig(object):
uninative_path = os.path.dirname(self.get("UNINATIVE_LOADER")) uninative_path = os.path.dirname(self.get("UNINATIVE_LOADER"))
if os.path.exists(uninative_path): if os.path.exists(uninative_path):
preload_paths = [os.path.join(uninative_path, i) for i in preload_items] preload_paths = [os.path.join(uninative_path, i) for i in preload_items]
os.environ['LD_PRELOAD'] = " ".join(preload_paths) self.qemu_environ['LD_PRELOAD'] = " ".join(preload_paths)
def check_args(self): def check_args(self):
for debug in ("-d", "--debug"): for debug in ("-d", "--debug"):
@@ -482,8 +484,8 @@ class BaseConfig(object):
sys.argv.remove(quiet) sys.argv.remove(quiet)
if 'gl' not in sys.argv[1:] and 'gl-es' not in sys.argv[1:]: if 'gl' not in sys.argv[1:] and 'gl-es' not in sys.argv[1:]:
os.environ['SDL_RENDER_DRIVER'] = 'software' self.qemu_environ['SDL_RENDER_DRIVER'] = 'software'
os.environ['SDL_FRAMEBUFFER_ACCELERATION'] = 'false' self.qemu_environ['SDL_FRAMEBUFFER_ACCELERATION'] = 'false'
unknown_arg = "" unknown_arg = ""
for arg in sys.argv[1:]: for arg in sys.argv[1:]:
@@ -1369,7 +1371,7 @@ class BaseConfig(object):
# need our font setup and show-cusor below so we need to see what qemu --help says # need our font setup and show-cusor below so we need to see what qemu --help says
# is supported so we can pass our correct config in. # is supported so we can pass our correct config in.
if not self.nographic and not self.sdl and not self.gtk and not self.publicvnc and not self.egl_headless == True: if not self.nographic and not self.sdl and not self.gtk and not self.publicvnc and not self.egl_headless == True:
output = subprocess.check_output([self.qemu_bin, "--help"], universal_newlines=True) output = subprocess.check_output([self.qemu_bin, "--help"], universal_newlines=True, env=self.qemu_environ)
if "-display gtk" in output: if "-display gtk" in output:
self.gtk = True self.gtk = True
elif "-display sdl" in output: elif "-display sdl" in output:
@@ -1393,7 +1395,7 @@ class BaseConfig(object):
if self.sdl == True: if self.sdl == True:
self.qemu_opt += 'sdl,' self.qemu_opt += 'sdl,'
elif self.gtk == True: elif self.gtk == True:
os.environ['FONTCONFIG_PATH'] = '/etc/fonts' self.qemu_environ['FONTCONFIG_PATH'] = '/etc/fonts'
self.qemu_opt += 'gtk,' self.qemu_opt += 'gtk,'
if self.gl == True: if self.gl == True:
@@ -1509,7 +1511,7 @@ class BaseConfig(object):
if len(self.portlocks): if len(self.portlocks):
for descriptor in self.portlocks.values(): for descriptor in self.portlocks.values():
pass_fds.append(descriptor.fileno()) pass_fds.append(descriptor.fileno())
process = subprocess.Popen(cmds, stderr=subprocess.PIPE, pass_fds=pass_fds) process = subprocess.Popen(cmds, stderr=subprocess.PIPE, pass_fds=pass_fds, env=self.qemu_environ)
self.qemupid = process.pid self.qemupid = process.pid
retcode = process.wait() retcode = process.wait()
if retcode: if retcode: