mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 05:46:03 +00:00
fix: RPCS3 opens from the emulator rail again (#1191)
RPCS3's AppImage could not start: its own runtime unpacks the image with a dwarfsextract it runs from a memfd, which Android refuses (EACCES), and it has no other way to run it. Emulator AppImages for arm64 now start through the shipped uruntime, which falls back to a file in /tmp. RPCS3 then stopped with "Null object" in utils::shm (errno 13): it reads /proc/sys/vm/overcommit_memory to pick memfd for guest memory, and apps cannot read it. The guest now gets the kernel's default policy (0) there when the real file is unreadable, like file-max.
This commit is contained in:
1 parent
ba582dea65
commit
aeb0fa57e3
5 files changed
+101
-4
No files matched your search
@@ -331,6 +331,10 @@ case $mode in
|
||||
*.appimage)
|
||||
export APPIMAGE_EXTRACT_AND_RUN=1
|
||||
chmod +x "$target" 2>/dev/null
|
||||
if [ ${#fex[@]} -eq 0 ] && [ -x /usr/local/lib/droiddeck/uruntime ]; then
|
||||
export TARGET_APPIMAGE=$target
|
||||
run_program /usr/local/lib/droiddeck/uruntime "$@"
|
||||
fi
|
||||
run_program "${fex[@]}" "$target" "$@"
|
||||
;;
|
||||
*.sh)
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import tempfile
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
|
||||
SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-session"
|
||||
URUNTIME = "/usr/local/lib/droiddeck/uruntime"
|
||||
|
||||
|
||||
def target_case():
|
||||
match = re.search(r"^ case \$\{target,,\} in\n.*?^ esac\n", SESSION.read_text(), re.M | re.S)
|
||||
return match.group(0)
|
||||
|
||||
|
||||
class SessionAppImageTest(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.dir = Path(tempfile.mkdtemp())
|
||||
self.addCleanup(shutil.rmtree, self.dir, True)
|
||||
self.image = self.dir / "rpcs3.AppImage"
|
||||
self.image.write_bytes(b"\x7fELF")
|
||||
self.uruntime = self.dir / "uruntime"
|
||||
self.uruntime.write_text("#!/bin/sh\n")
|
||||
self.uruntime.chmod(0o755)
|
||||
|
||||
def launch(self, fex=()):
|
||||
script = ("set -u\n"
|
||||
"run_program() { printf '%%s\\n' \"TARGET=${TARGET_APPIMAGE:-} EXTRACT=${APPIMAGE_EXTRACT_AND_RUN:-}\" \"$@\"; exit 0; }\n"
|
||||
"target=%s\nfex=(%s)\nset -- --no-gui\n" % (self.image, " ".join(fex))
|
||||
+ target_case().replace(URUNTIME, str(self.uruntime)))
|
||||
env = {k: v for k, v in os.environ.items() if k not in ("TARGET_APPIMAGE", "APPIMAGE_EXTRACT_AND_RUN")}
|
||||
return subprocess.run(["bash", "-c", script], env=env, capture_output=True, text=True, timeout=30).stdout.splitlines()
|
||||
|
||||
def test_an_arm64_image_runs_through_the_shipped_runtime(self):
|
||||
self.assertEqual(["TARGET=%s EXTRACT=1" % self.image, str(self.uruntime), "--no-gui"], self.launch())
|
||||
|
||||
def test_without_the_shipped_runtime_the_image_runs_itself(self):
|
||||
self.uruntime.unlink()
|
||||
self.assertEqual(["TARGET= EXTRACT=1", str(self.image), "--no-gui"], self.launch())
|
||||
|
||||
def test_an_x86_image_still_starts_under_fex(self):
|
||||
fex = ("/usr/local/bin/droiddeck-fex", "run", "--mode", "on", "--")
|
||||
self.assertEqual(["TARGET= EXTRACT=1", *fex, str(self.image), "--no-gui"], self.launch(fex))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Reference in new issue
Block a user