Modified: trunk/Tools/flatpak/flatpakutils.py (262056 => 262057)
--- trunk/Tools/flatpak/flatpakutils.py 2020-05-22 14:12:53 UTC (rev 262056)
+++ trunk/Tools/flatpak/flatpakutils.py 2020-05-22 14:58:41 UTC (rev 262057)
@@ -487,11 +487,11 @@
self.sccache_token = ""
self.sccache_scheduler = DEFAULT_SCCACHE_SCHEDULER
- def execute_command(self, args, stdout=None, stderr=None):
+ def execute_command(self, args, stdout=None, stderr=None, env=None):
_log.debug('Running in sandbox: %s\n' % ' '.join(args))
result = 0
try:
- result = subprocess.check_call(args, stdout=stdout, stderr=stderr)
+ result = subprocess.check_call(args, stdout=stdout, stderr=stderr, env=env)
except subprocess.CalledProcessError as err:
if self.verbose:
cmd = ' '.join(err.cmd)
@@ -638,6 +638,9 @@
"TEST_RUNNER_INJECTED_BUNDLE_FILENAME": os.path.join(sandbox_build_path, "lib/libTestRunnerInjectedBundle.so"),
}
+ if not args:
+ args.append("bash")
+
if args:
if os.path.exists(args[0]):
command = os.path.normpath(os.path.abspath(args[0]))
@@ -651,22 +654,12 @@
else:
building = False
- # FIXME: Using the `run` flatpak command would be better, but it doesn't
- # have a --bind-mount option.
- flatpak_command = ["flatpak", "build",
+ flatpak_command = ["flatpak", "run",
"--die-with-parent",
+ "--allow=devel",
"--talk-name=org.a11y.Bus",
"--talk-name=org.gtk.vfs",
- "--talk-name=org.gtk.vfs.*",
- "--bind-mount=/run/shm=/dev/shm",
- # 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)]
+ "--talk-name=org.gtk.vfs.*"]
if args and args[0].endswith("build-webkit") and not self.is_branch_build():
# Ensure self.build_path exists.
@@ -676,12 +669,6 @@
if e.errno != errno.EEXIST:
raise e
- # We mount WebKitBuild/PORTNAME/BuildType to /app/webkit/WebKitBuild/BuildType
- # so we can build WPE and GTK in a same source tree.
- # The bind-mount is always needed, excepted during the initial setup (SDK install/updates).
- if os.path.isdir(self.build_path):
- flatpak_command.append("--bind-mount=%s=%s" % (sandbox_build_path, self.build_path))
-
if not building:
flatpak_command.extend([
"--device=all",
@@ -695,31 +682,9 @@
"--socket=x11",
"--system-talk-name=org.a11y.Bus",
"--system-talk-name=org.freedesktop.GeoClue2",
- "--talk-name=org.a11y.Bus",
"--talk-name=org.freedesktop.Flatpak"
])
- xdg_runtime_dir = os.environ.get('XDG_RUNTIME_DIR', None)
- if not xdg_runtime_dir:
- _log.debug('XDG_RUNTIME_DIR not set. Trying default location.')
- try:
- with open(os.devnull, 'w') as devnull:
- uid = subprocess.check_output(("id", "-u"), stderr=devnull).decode().strip()
- xdg_runtime_dir = '/run/user/{uid}'.format(uid=uid)
- except subprocess.CalledProcessError:
- _log.debug("Could not determine XDG_RUNIME_DIR. This may cause bubblewrap to fail.")
-
- if xdg_runtime_dir:
- uid_doc_path = os.path.join(xdg_runtime_dir, 'doc')
- if os.path.exists(uid_doc_path):
- flatpak_command.append("--bind-mount={uid_doc_path}={uid_doc_path}".format(uid_doc_path=uid_doc_path))
- else:
- _log.debug("Can't find user document path at '{uid_doc_path}'. Not mounting it.".format(uid_doc_path=uid_doc_path))
-
- coredumps_dir = os.environ.get("WEBKIT_CORE_DUMPS_DIRECTORY")
- if coredumps_dir and os.path.isdir(coredumps_dir):
- flatpak_command.append("--bind-mount={coredumps_dir}={coredumps_dir}".format(coredumps_dir=coredumps_dir))
-
sandbox_environment.update({
"TZ": "PST8PDT",
"LANG": "en_US.UTF-8",
@@ -797,7 +762,6 @@
_log.debug('Enabling the icecream compiler')
if share_network_option not in flatpak_command:
flatpak_command.append(share_network_option)
- flatpak_command.append("--bind-mount=/var/run/icecc=/var/run/icecc")
n_cores = multiprocessing.cpu_count() * 3
_log.debug('Following icecream recommendation for the number of cores to use: %d' % n_cores)
@@ -808,6 +772,7 @@
return 1
sandbox_environment.update({
"CCACHE_PREFIX": "icecc",
+ "ICECC_TEST_SOCKET": "/run/icecc/iceccd.socket",
"ICECC_VERSION": toolchain_path,
"NUMBER_OF_PROCESSORS": n_cores,
})
@@ -819,10 +784,16 @@
if not kwargs.get('building_gst'):
gst_env = self.setup_gstbuild(building)
- flatpak_command += extra_flatpak_args + [self.flatpak_build_path] + gst_env + args
+ flatpak_command += extra_flatpak_args + gst_env + ['--command=%s' % args[0], "org.webkit.Sdk"] + args[1:]
+ 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)
+ })
+
try:
- return self.execute_command(flatpak_command, stdout=stdout)
+ return self.execute_command(flatpak_command, stdout=stdout, env=flatpak_env)
except KeyboardInterrupt:
return 0
Added: trunk/Tools/flatpak/webkit-bwrap (0 => 262057)
--- trunk/Tools/flatpak/webkit-bwrap (rev 0)
+++ trunk/Tools/flatpak/webkit-bwrap 2020-05-22 14:58:41 UTC (rev 262057)
@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Copyright (C) 2020 Igalia S.L.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+import os
+import shlex
+import sys
+import tempfile
+
+scriptdir = os.path.abspath(os.path.dirname(__file__))
+
+def main(args: list) -> int:
+ tmpdir = tempfile.gettempdir()
+ source_root = os.path.normpath(os.path.abspath(os.path.join(scriptdir, '../../')))
+ bind_mounts = {
+ "/app/webkit": source_root,
+ # Access to /run/host is required by the crash log reporter.
+ f"/run/host{tmpdir}": f"{tmpdir}"
+ }
+
+ try_bind_mounts = {
+ "/run/icecc": "/var/run/icecc"
+ }
+
+ build_path = os.environ.get("WEBKIT_BUILD_DIR_BIND_MOUNT")
+ if build_path:
+ dest, src = ""
+ try_bind_mounts[dest] = src
+
+ coredumps_dir = os.environ.get("WEBKIT_CORE_DUMPS_DIRECTORY")
+ if coredumps_dir:
+ try_bind_mounts[coredumps_dir] = coredumps_dir
+
+ bwrap_args = ["bwrap", ]
+ for dst, src in bind_mounts.items():
+ bwrap_args.extend(["--bind", src, dst])
+
+ for dst, src in try_bind_mounts.items():
+ bwrap_args.extend(["--bind-try", src, dst])
+
+ return os.system(' '.join([shlex.quote(a) for a in bwrap_args + args]))
+
+if __name__ == "__main__":
+ sys.exit(main(sys.argv[1:]))
Property changes on: trunk/Tools/flatpak/webkit-bwrap
___________________________________________________________________
