Changeset 269949 in webkit

Timestamp:

Nov 18, 2020 2:44:41 AM (3 years ago)

Author:

clopez@igalia.com

Message:

[FlatPak] update-webkitgtk-libs fails after a clean build
​https://bugs.webkit.org/show_bug.cgi?id=218724

Reviewed by Philippe Normand.

The issue was caused because when adding a new flatpak repository
via the method FlatpakRepos.add() that repository is not added to
the internal list of available repositories inside the object FlatpakRepos.
So then the check on setup_builddir() added in r268542 failed because
the internal list of repositories on the object FlatpakRepos() was
empty on the first run (after a clean build).
To fix this we ensure to re-generate the internal list of flatpak
repositories any time that a new reporistory is added by calling
FlatpakRepos.update() after FlatpakRepos.add()

On top of that fix, we add another fix to make the code more robust.
Now it allows the generation of toolchains to fail without causing
a fatal error. Also a new check is added in order to retry to generate
the toolchains in the next run if is detected that they were not
correctly generated.

• flatpak/flatpakutils.py:

(FlatpakRepos.add):
(WebkitFlatpak.load_from_args):
(WebkitFlatpak.main):
(WebkitFlatpak.check_toolchains_generated):
(WebkitFlatpak.pack_toolchain):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2020-11-18  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [FlatPak] update-webkitgtk-libs fails after a clean build
+        https://bugs.webkit.org/show_bug.cgi?id=218724
+
+        Reviewed by Philippe Normand.
+
+        The issue was caused because when adding a new flatpak repository
+        via the method FlatpakRepos.add() that repository is not added to
+        the internal list of available repositories inside the object FlatpakRepos.
+        So then the check on setup_builddir() added in r268542 failed because
+        the internal list of repositories on the object FlatpakRepos() was
+        empty on the first run (after a clean build).
+        To fix this we ensure to re-generate the internal list of flatpak
+        repositories any time that a new reporistory is added by calling
+        FlatpakRepos.update() after FlatpakRepos.add()
+
+        On top of that fix, we add another fix to make the code more robust.
+        Now it allows the generation of toolchains to fail without causing
+        a fatal error. Also a new check is added in order to retry to generate
+        the toolchains in the next run if is detected that they were not
+        correctly generated.
+
+        * flatpak/flatpakutils.py:
+        (FlatpakRepos.add):
+        (WebkitFlatpak.load_from_args):
+        (WebkitFlatpak.main):
+        (WebkitFlatpak.check_toolchains_generated):
+        (WebkitFlatpak.pack_toolchain):
+
 2020-11-17  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -264 +264 @@
 
     def add(self, repo, override=True):
-        same_name = None
-        for name, tmprepo in self.repos.items():
-            if repo.url == tmprepo.url:
-                return tmprepo
-            elif repo.name == name:
-                same_name = tmprepo
-
-        if same_name:
-            if override:
-                self.flatpak("remote-modify", repo.name, "--url=" + repo.url)
-                same_name.url = repo.url
-
-                return same_name
+        try:
+            same_name = None
+            for name, tmprepo in self.repos.items():
+                if repo.url == tmprepo.url:
+                    return tmprepo
+                elif repo.name == name:
+                    same_name = tmprepo
+
+            if same_name:
+                if override:
+                    self.flatpak("remote-modify", repo.name, "--url=" + repo.url)
+                    same_name.url = repo.url
+
+                    return same_name
+                else:
+                    return None
             else:
-                return None
-        else:
-            args = ["remote-add", repo.name, "--if-not-exists"]
-            if repo.repo_file:
-                args.extend(["--from", repo.repo_file.name])
-            else:
-                args.extend(["--no-gpg-verify", repo.url])
-            self.flatpak(*args, comment="Adding repo %s" % repo.name)
-
-        repo.repos = self
-        return repo
+                args = ["remote-add", repo.name, "--if-not-exists"]
+                if repo.repo_file:
+                    args.extend(["--from", repo.repo_file.name])
+                else:
+                    args.extend(["--no-gpg-verify", repo.url])
+                self.flatpak(*args, comment="Adding repo %s" % repo.name)
+
+            repo.repos = self
+            return repo
+        finally:
+            self.update()
 
 
@@ -442 +445 @@
         distributed_build_options.add_argument("--use-icecream", dest="use_icecream", help="Use the distributed icecream (icecc) compiler.", action="store_true")
         distributed_build_options.add_argument("-r", "--regenerate-toolchains", dest="regenerate_toolchains", action="store_true",
-                             help="Regenerate IceCC distribuable toolchain archives")
+                                               help="Regenerate IceCC distributable toolchain archives")
         distributed_build_options.add_argument("-t", "--sccache-token", dest="sccache_token",
                                                help="sccache authentication token")
@@ -872 +875 @@
             version_before_update = repo.version("org.webkit.Sdk")
             repo.flatpak("update", comment="Updating Flatpak %s environment" % self.build_type)
-            regenerate_toolchains = repo.version("org.webkit.Sdk") != version_before_update
+            regenerate_toolchains = (repo.version("org.webkit.Sdk") != version_before_update) or not self.check_toolchains_generated()
 
             for package in self._get_packages():
@@ -890 +893 @@
         result = self.setup_dev_env()
         if regenerate_toolchains:
+            Console.message("Updating icecc distributable toolchain archives")
             self.icc_version = {}
             toolchains = self.pack_toolchain(("gcc", "g++"), {"/usr/bin/c++": "/usr/bin/g++"})
             toolchains.extend(self.pack_toolchain(("clang", "clang++"), {"/usr/bin/clang++": "/usr/bin/clang++"}))
-            self.save_config(toolchains)
+            if len(toolchains) > 1:
+                self.save_config(toolchains)
+            else:
+                Console.error_message("Error generating icecc distributable toolchain archives")
 
         return result
@@ -932 +939 @@
             Console.message("Created %s sccache config file. It will automatically be used when building WebKit", self.sccache_config_file)
 
+    def check_toolchains_generated(self):
+        found_toolchains = 0
+        if os.path.isfile(self.config_file):
+            with open(self.config_file, 'r') as config_fd:
+                config = json.load(config_fd)
+                if 'icecc_version' in config:
+                    for compiler in config['icecc_version']:
+                        if os.path.isfile(config['icecc_version'][compiler]):
+                            found_toolchains += 1
+        return found_toolchains > 1
+
     def pack_toolchain(self, compilers, path_mapping):
         with tempfile.NamedTemporaryFile() as tmpfile:
             command = ['icecc', '--build-native']
             command.extend(["/usr/bin/%s" % compiler for compiler in compilers])
-            self.run_in_sandbox(*command, stdout=tmpfile, cwd=self.source_root, skip_icc=True)
+            retcode = self.run_in_sandbox(*command, stdout=tmpfile, cwd=self.source_root, skip_icc=True)
+            if retcode != 0:
+                Console.error_message('Flatpak command "%s" failed with return code %s', " ".join(command), retcode)
+                return []
             tmpfile.flush()
             tmpfile.seek(0)