summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2024-01-18 15:22:38 +0000
committerSteve Sakoman <steve@sakoman.com>2024-02-22 04:34:14 -1000
commit20e316e372f9a57d7b16e55b9c02194cc37d4a81 (patch)
tree7f53475e0c3c78c7f0cd90afe8b6cf6d9bf77e9c
parentab7fecefc6d511f64bf236df3605df866c249b9b (diff)
downloadpoky-20e316e372f9a57d7b16e55b9c02194cc37d4a81.tar.gz
reproducible: Fix race with externalsrc/devtool over lockfile
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] (From OE-Core rev: 6bb824019fd7335a10fdcebf7d301c101d60ad61) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 4bc0eb4bd90e6e6e46581a8ed367212bdd910a26) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/lib/oe/reproducible.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oe/reproducible.py b/meta/lib/oe/reproducible.py
index 9ac75c02e3..448befce33 100644
--- a/meta/lib/oe/reproducible.py
+++ b/meta/lib/oe/reproducible.py
@@ -131,6 +131,9 @@ def get_source_date_epoch_from_youngest_file(d, sourcedir):
131 files = [f for f in files if not f[0] == '.'] 131 files = [f for f in files if not f[0] == '.']
132 132
133 for fname in files: 133 for fname in files:
134 if fname == "singletask.lock":
135 # Ignore externalsrc/devtool lockfile [YOCTO #14921]
136 continue
134 filename = os.path.join(root, fname) 137 filename = os.path.join(root, fname)
135 try: 138 try:
136 mtime = int(os.lstat(filename).st_mtime) 139 mtime = int(os.lstat(filename).st_mtime)