From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 18 Jan 2024 15:22:38 +0000 (+0000)
Subject: reproducible: Fix race with externalsrc/devtool over lockfile
X-Git-Tag: uninative-4.4~438
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bc0eb4bd90e6e6e46581a8ed367212bdd910a26;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

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]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oe/reproducible.py b/meta/lib/oe/reproducible.py
index 9ac75c02e38..448befce332 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):
         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)