Modified: trunk/Tools/ChangeLog (262116 => 262117)
--- trunk/Tools/ChangeLog 2020-05-25 08:31:38 UTC (rev 262116)
+++ trunk/Tools/ChangeLog 2020-05-25 08:33:09 UTC (rev 262117)
@@ -1,5 +1,19 @@
2020-05-25 Philippe Normand <[email protected]>
+ REGRESSION(r262057): [Flatpak SDK] sccache-dist server no longer starting
+ https://bugs.webkit.org/show_bug.cgi?id=212326
+
+ Reviewed by Žan Doberšek.
+
+ A few mount points were missing in the sandbox created by
+ `flatpak run` preventing the sccache-dist server to start and keep running.
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.run_in_sandbox):
+ * flatpak/webkit-bwrap:
+
+2020-05-25 Philippe Normand <[email protected]>
+
[Flatpak SDK] Fixup icecc support
https://bugs.webkit.org/show_bug.cgi?id=212301
Modified: trunk/Tools/flatpak/flatpakutils.py (262116 => 262117)
--- trunk/Tools/flatpak/flatpakutils.py 2020-05-25 08:31:38 UTC (rev 262116)
+++ trunk/Tools/flatpak/flatpakutils.py 2020-05-25 08:33:09 UTC (rev 262117)
@@ -655,7 +655,9 @@
building = False
flatpak_command = ["flatpak", "run",
+ "--user",
"--die-with-parent",
+ "--filesystem=host",
"--allow=devel",
"--talk-name=org.a11y.Bus",
"--talk-name=org.gtk.vfs",
@@ -673,7 +675,6 @@
flatpak_command.extend([
"--device=all",
"--device=dri",
- "--filesystem=host",
"--share=ipc",
"--share=network",
"--socket=pulseaudio",
@@ -790,7 +791,8 @@
flatpak_env = os.environ
flatpak_env.update({
"FLATPAK_BWRAP": os.path.join(scriptdir, "webkit-bwrap"),
- "WEBKIT_BUILD_DIR_BIND_MOUNT": "%s:%s" % (sandbox_build_path, self.build_path)
+ "WEBKIT_BUILD_DIR_BIND_MOUNT": "%s:%s" % (sandbox_build_path, self.build_path),
+ "WEBKIT_FLATPAK_USER_DIR": os.environ["FLATPAK_USER_DIR"],
})
try:
Modified: trunk/Tools/flatpak/webkit-bwrap (262116 => 262117)
--- trunk/Tools/flatpak/webkit-bwrap 2020-05-25 08:31:38 UTC (rev 262116)
+++ trunk/Tools/flatpak/webkit-bwrap 2020-05-25 08:33:09 UTC (rev 262117)
@@ -30,9 +30,14 @@
bind_mounts = {
"/app/webkit": source_root,
# Access to /run/host is required by the crash log reporter.
- f"/run/host{tmpdir}": f"{tmpdir}"
+ f"/run/host{tmpdir}": f"{tmpdir}",
+ "/run/shm": "/dev/shm",
}
+ flatpak_user_dir = os.environ.get("WEBKIT_FLATPAK_USER_DIR")
+ if flatpak_user_dir:
+ bind_mounts["/var/tmp"] = os.path.join(flatpak_user_dir, "var", "tmp")
+
try_bind_mounts = {
"/run/icecc": "/var/run/icecc"
}
