mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 20:36:04 +00:00
fix(fex): provide current GBM runtime libraries
This commit is contained in:
1 parent
d91b26bfab
commit
22e9d0f236
2 files changed
+75
-4
No files matched your search
@@ -37,7 +37,7 @@ RUNTIMES = {SNIPER_APPID: ("sniper_platform_", "Steam Linux Runtime 3.0 (sniper"
|
||||
SLR4_APPID: ("steamrt4_platform_", "Steam Linux Runtime 4.0 (steamrt4")}
|
||||
MARKER = ".droiddeck-fex"
|
||||
LAYOUT = 1
|
||||
ROOTFS_LAYOUT = 8
|
||||
ROOTFS_LAYOUT = 9
|
||||
ARCH_DIRS = ("x86_64-linux-gnu", "i386-linux-gnu")
|
||||
INTERPRETERS = ("ld-linux-x86-64.so.2", "ld-linux.so.2")
|
||||
PROVIDED = frozenset((
|
||||
@@ -48,7 +48,13 @@ PROVIDED = frozenset((
|
||||
"libssl.so.3", "libcrypto.so.3",
|
||||
"libfreetype.so.6", "libpng16.so.16", "libbrotlidec.so.1", "libbrotlicommon.so.1", "libbz2.so.1.0", "libz.so.1",
|
||||
"libwayland-client.so.0", "libwayland-egl.so.1", "libwayland-server.so.0", "libffi.so.8",
|
||||
"libgbm.so.1", "libdrm.so.2", "libexpat.so.1",
|
||||
))
|
||||
PROVIDED_NEEDS = {
|
||||
"libwayland-client.so.0": ("libffi.so.8",),
|
||||
"libwayland-server.so.0": ("libffi.so.8",),
|
||||
"libgbm.so.1": ("libdrm.so.2", "libexpat.so.1"),
|
||||
}
|
||||
GLIBC_BUILD = re.compile(r"^(?:ld|lib[A-Za-z_]+)-2\.[0-9]+\.so$|^libSegFault\.so$")
|
||||
GUEST_LIBDIRS = (("x86_64", "lib/x86_64-linux-gnu"), ("i386", "lib/i386-linux-gnu"))
|
||||
PRELOAD_NAMES = ("libblsession.so", "libfakeinput.so")
|
||||
@@ -313,9 +319,8 @@ def provides_newer(base, provider):
|
||||
|
||||
|
||||
def mirror(source, provider, name, target):
|
||||
wayland_needs_ffi = name in ("libwayland-client.so.0", "libwayland-server.so.0")
|
||||
usable_provider = provider and os.path.exists(os.path.join(provider, name)) and (
|
||||
not wayland_needs_ffi or os.path.exists(os.path.join(provider, "libffi.so.8")))
|
||||
usable_provider = provider and all(os.path.exists(os.path.join(provider, needed))
|
||||
for needed in (name,) + PROVIDED_NEEDS.get(name, ()))
|
||||
if name in PROVIDED and usable_provider:
|
||||
os.symlink(os.path.realpath(os.path.join(provider, name)), os.path.join(target, name))
|
||||
return
|
||||
|
||||
@@ -511,6 +511,72 @@ class PrepareTest(FexTestCase):
|
||||
fixed = subprocess.run(command, env=env, capture_output=True, text=True)
|
||||
self.assertEqual(fixed.returncode, 0, fixed.stderr)
|
||||
|
||||
def test_gbm_and_its_dependencies_use_the_newer_runtime_on_both_architectures(self):
|
||||
self.fex_tool()
|
||||
sniper = self.runtime()
|
||||
FEX["materialize"](str(sniper))
|
||||
provider = self.graphics(sniper)
|
||||
names = ("libgbm.so.1", "libdrm.so.2", "libexpat.so.1")
|
||||
for arch in ("x86_64-linux-gnu", "i386-linux-gnu"):
|
||||
for name in names:
|
||||
self.write(sniper / "files/lib" / arch / name, b"old ABI")
|
||||
self.write(provider / "files/lib" / arch / name, b"new ABI " + name.encode())
|
||||
fex, _ = self.quiet(FEX["prepare"])
|
||||
for arch in ("x86_64-linux-gnu", "i386-linux-gnu"):
|
||||
for name in names:
|
||||
self.assertEqual((Path(fex["rootfs"]) / "lib" / arch / name).read_bytes(), b"new ABI " + name.encode())
|
||||
|
||||
def test_gbm_requires_usable_provider_dependencies_on_both_architectures(self):
|
||||
self.fex_tool()
|
||||
sniper = self.runtime()
|
||||
FEX["materialize"](str(sniper))
|
||||
provider = self.graphics(sniper)
|
||||
for arch in ("x86_64-linux-gnu", "i386-linux-gnu"):
|
||||
for name in ("libgbm.so.1", "libdrm.so.2"):
|
||||
self.write(sniper / "files/lib" / arch / name, b"base")
|
||||
self.write(provider / "files/lib" / arch / name, b"provider")
|
||||
os.symlink("missing-expat.so", provider / "files/lib" / arch / "libexpat.so.1")
|
||||
fex, _ = self.quiet(FEX["prepare"])
|
||||
for arch in ("x86_64-linux-gnu", "i386-linux-gnu"):
|
||||
root = Path(fex["rootfs"]) / "lib" / arch
|
||||
self.assertEqual((root / "libgbm.so.1").read_bytes(), b"base")
|
||||
self.assertEqual((root / "libdrm.so.2").read_bytes(), b"provider")
|
||||
|
||||
@unittest.skipUnless(shutil.which("cc"), "C compiler unavailable")
|
||||
def test_bundled_library_resolves_the_new_gbm_symbol(self):
|
||||
self.fex_tool()
|
||||
sniper = self.runtime()
|
||||
FEX["materialize"](str(sniper))
|
||||
provider = self.graphics(sniper)
|
||||
base = sniper / "files/lib/x86_64-linux-gnu"
|
||||
newer = provider / "files/lib/x86_64-linux-gnu"
|
||||
source = self.tmp / "gbm.c"
|
||||
self.write(newer / "libdrm.so.2", b"drm")
|
||||
self.write(newer / "libexpat.so.1", b"expat")
|
||||
for folder, symbol in ((base, "gbm_bo_create_with_modifiers"), (newer, "gbm_bo_create_with_modifiers2")):
|
||||
source.write_text("void *%s(void) { return 0; }\n" % symbol)
|
||||
subprocess.run(["cc", "-shared", "-fPIC", "-nostdlib", "-Wl,-soname,libgbm.so.1",
|
||||
"-o", str(folder / "libgbm.so.1"), str(source)], check=True, capture_output=True)
|
||||
fex, _ = self.quiet(FEX["prepare"])
|
||||
root = Path(fex["rootfs"]) / "lib/x86_64-linux-gnu"
|
||||
source.write_text("extern void *gbm_bo_create_with_modifiers2(void);\n"
|
||||
"void *probe(void) { return gbm_bo_create_with_modifiers2(); }\n")
|
||||
probe = self.tmp / "libgbmprobe.so"
|
||||
subprocess.run(["cc", "-shared", "-fPIC", "-nostdlib", "-o", str(probe), str(source),
|
||||
"-L" + str(newer), "-l:libgbm.so.1", "-Wl,-rpath," + str(root)],
|
||||
check=True, capture_output=True)
|
||||
command = [sys.executable, "-c",
|
||||
"import ctypes,sys; "
|
||||
"ctypes.CDLL(sys.argv[2], mode=ctypes.RTLD_GLOBAL) if len(sys.argv) > 2 else None; "
|
||||
"ctypes.CDLL(sys.argv[1]).probe()",
|
||||
str(probe)]
|
||||
env = {k: v for k, v in os.environ.items() if not k.startswith("LD_")}
|
||||
broken = subprocess.run(command + [str(base / "libgbm.so.1")], env=env, capture_output=True, text=True)
|
||||
self.assertNotEqual(broken.returncode, 0)
|
||||
self.assertIn("undefined symbol: gbm_bo_create_with_modifiers2", broken.stderr)
|
||||
fixed = subprocess.run(command, env=env, capture_output=True, text=True)
|
||||
self.assertEqual(fixed.returncode, 0, fixed.stderr)
|
||||
|
||||
def test_freetype_and_dependencies_use_the_newer_runtime_on_both_architectures(self):
|
||||
self.fex_tool()
|
||||
sniper = self.runtime()
|
||||
|
||||
Reference in new issue
Block a user