Changeset 278606 in webkit

Timestamp:

Jun 8, 2021, 7:16:21 AM (5 years ago)

Author:

Philippe Normand

Message:

[Flatpak SDK] Enable network access in the WPE build sandbox
​https://bugs.webkit.org/show_bug.cgi?id=225914

Reviewed by Michael Catanzaro.

• flatpak/flatpakutils.py:

(WebkitFlatpak.run_in_sandbox): Allow network access for WPE build jobs, so that CMake is
able to git checkout Cog from github.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2021-06-08  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak SDK] Enable network access in the WPE build sandbox
+        https://bugs.webkit.org/show_bug.cgi?id=225914
+
+        Reviewed by Michael Catanzaro.
+
+        * flatpak/flatpakutils.py:
+        (WebkitFlatpak.run_in_sandbox): Allow network access for WPE build jobs, so that CMake is
+        able to git checkout Cog from github.
+
 2021-06-08  Jean-Yves Avenard  <jya@apple.com>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -766 +766 @@
                     raise e
 
+        share_network_option = "--share=network"
+
+        if self.platform == 'WPE':
+            flatpak_command.append(share_network_option)
+
         if not building:
             flatpak_command.extend([
@@ -842 +847 @@
                 sandbox_environment[envvar] = value
 
-        share_network_option = "--share=network"
         remote_sccache_configs = set(["SCCACHE_REDIS", "SCCACHE_BUCKET", "SCCACHE_MEMCACHED",
                                       "SCCACHE_GCS_BUCKET", "SCCACHE_AZURE_CONNECTION_STRING",
@@ -871 +875 @@
         if self.use_icecream and not skip_icc:
             _log.debug('Enabling the icecream compiler')
-            if share_network_option not in flatpak_command:
-                flatpak_command.append(share_network_option)
-            flatpak_command.append("--filesystem=home")
+            flatpak_command.extend([share_network_option, "--filesystem=home"])
 
             n_cores = multiprocessing.cpu_count() * 3
@@ -953 +955 @@
             flatpak_env["WEBKIT_FLATPAK_DISPLAY"] = display
 
+        # FIXME: Remove duplicate values from the flatpak command.
+        command = flatpak_command
+
         if gather_output:
-            return run_sanitized(flatpak_command, gather_output=True, ignore_stderr=True, env=flatpak_env)
+            return run_sanitized(command, gather_output=True, ignore_stderr=True, env=flatpak_env)
 
         try:
-            return self.execute_command(flatpak_command, stdout=stdout, env=flatpak_env, keep_signals=keep_signals)
+            return self.execute_command(command, stdout=stdout, env=flatpak_env, keep_signals=keep_signals)
         except KeyboardInterrupt:
             return 0