Modified: trunk/Tools/ChangeLog (278605 => 278606)
--- trunk/Tools/ChangeLog 2021-06-08 14:02:56 UTC (rev 278605)
+++ trunk/Tools/ChangeLog 2021-06-08 14:16:21 UTC (rev 278606)
@@ -1,3 +1,14 @@
+2021-06-08 Philippe Normand <[email protected]>
+
+ [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 <[email protected]>
Update jya's email address
Modified: trunk/Tools/flatpak/flatpakutils.py (278605 => 278606)
--- trunk/Tools/flatpak/flatpakutils.py 2021-06-08 14:02:56 UTC (rev 278605)
+++ trunk/Tools/flatpak/flatpakutils.py 2021-06-08 14:16:21 UTC (rev 278606)
@@ -765,6 +765,11 @@
if e.errno != errno.EEXIST:
raise e
+ share_network_option = "--share=network"
+
+ if self.platform == 'WPE':
+ flatpak_command.append(share_network_option)
+
if not building:
flatpak_command.extend([
"--device=all",
@@ -841,7 +846,6 @@
if var_tokens[0] in env_var_prefixes_to_keep or envvar in env_vars_to_keep or envvar_in_suffixes_to_keep(envvar) or (not os.environ.get('GST_BUILD_PATH') and var_tokens[0] == "GST"):
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",
"WEBKIT_USE_SCCACHE"])
@@ -870,9 +874,7 @@
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
_log.debug('Following icecream recommendation for the number of cores to use: %d' % n_cores)
@@ -952,11 +954,14 @@
if display:
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
