Changeset 258699 in webkit

Timestamp:

Mar 19, 2020 8:24:52 AM (4 years ago)

Author:

Philippe Normand

Message:

[Flatpak SDK] Release logs not sent to journald when running within the SDK runtime
​https://bugs.webkit.org/show_bug.cgi?id=209223

Reviewed by Carlos Alberto Lopez Perez.

flatpak build doesn't expose a --socket option for white-listing
the systemd journal socket. So white-list everything in /run. 🤷

• flatpak/flatpakutils.py:

(WebkitFlatpak.run_in_sandbox):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• flatpak/flatpakutils.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-03-19  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak SDK] Release logs not sent to journald when running within the SDK runtime
+        https://bugs.webkit.org/show_bug.cgi?id=209223
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        flatpak build doesn't expose a --socket option for white-listing
+        the systemd journal socket. So white-list everything in /run. 🤷
+
+        * flatpak/flatpakutils.py:
+        (WebkitFlatpak.run_in_sandbox):
+
 2020-03-19  Charlie Turner  <cturner@igalia.com>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -569 +569 @@
 
         sandbox_build_path = os.path.join(self.sandbox_source_root, "WebKitBuild", self.build_type)
+        # FIXME: Using the `run` flatpak command would be better, but it doesn't
+        # have a --bind-mount option.
         flatpak_command = ["flatpak", "build",
                            "--die-with-parent",
@@ -575 +577 @@
                            "--talk-name=org.gtk.vfs.*",
                            "--bind-mount=/run/shm=/dev/shm",
-                           # Workaround for https://webkit.org/b/187384 to have our own perl modules usable inside the sandbox
-                           # as setting the PERL5LIB envvar won't work inside apache (and for scripts using `perl -T``).
+                           # Access to /run/host is required by the crash log reporter.
                            "--bind-mount=/run/host/%s=%s" % (tempfile.gettempdir(), tempfile.gettempdir()),
+                           # flatpak build doesn't expose a --socket option for
+                           # white-listing the systemd journal socket. So
+                           # white-list it in /run, hoping this is the right
+                           # path.
+                           "--bind-mount=/run/systemd/journal=/run/systemd/journal",
                            "--bind-mount=%s=%s" % (self.sandbox_source_root, self.source_root),
                            # We mount WebKitBuild/PORTNAME/BuildType to /app/webkit/WebKitBuild/BuildType