]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
reproducible: Fix race with externalsrc/devtool over lockfile
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 18 Jan 2024 15:22:38 +0000 (15:22 +0000)
committerSteve Sakoman <steve@sakoman.com>
Wed, 14 Feb 2024 17:09:08 +0000 (07:09 -1000)
We occasionally see races over the lockfile used by externalsrc/devtool
when walking files for the source_date_epock calculation. Skip this file
if present to avoid the issues and fix a real issue where SDE could be
contaminated too.

[YOCTO #14921]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 4bc0eb4bd90e6e6e46581a8ed367212bdd910a26)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/lib/oe/reproducible.py

index 9ac75c02e38524772492ecacee58565a72bc8f2b..448befce332f80c1b7fab98871a532970ab73f86 100644 (file)
@@ -131,6 +131,9 @@ def get_source_date_epoch_from_youngest_file(d, sourcedir):
         files = [f for f in files if not f[0] == '.']
 
         for fname in files:
+            if fname == "singletask.lock":
+                 # Ignore externalsrc/devtool lockfile [YOCTO #14921]
+                 continue
             filename = os.path.join(root, fname)
             try:
                 mtime = int(os.lstat(filename).st_mtime)