summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMateusz Marciniec <mateuszmar2@gmail.com>2023-02-11 00:18:34 +0100
committerSteve Sakoman <steve@sakoman.com>2023-02-25 09:25:51 -1000
commitf1f24e9dc4d4016702d40ec5567cf65d9c04000d (patch)
tree71e11e963d04c9e5ca3db969464227be8f825ec0
parente8c4cf47ab7d7b7c7944908a4a2beae39b48eafe (diff)
downloadopenembedded-core-f1f24e9dc4d4016702d40ec5567cf65d9c04000d.tar.gz
sstatesig: Improve output hash calculation
Symbolic links to the files are included during the output hash calculation but symlinks to the directories are missed. So if the new symlink to a directory was the only change made, then the output hash won't change, and the Hash Equivalence server may change unihash. In the next run bitbake may use an older package from sstate-cache. To fix this followlinks=True flag could be set for os.walk but it can lead to infinite recursion if link points to a parent directory of itself. Also, all files from a directory to which symlink points would be included in depsig file. Therefore another solution was applied, I added code that will loop through directories and process those that are symlinks. Signed-off-by: Mateusz Marciniec <mateuszmar2@gmail.com> Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit ee729163f31f26b1462a47e1e53f7a0f9de9b464) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/lib/oe/sstatesig.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index bf48aed7e1..fb4abe8241 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -662,6 +662,10 @@ def OEOuthashBasic(path, sigfile, task, d):
if f == 'fixmepath':
continue
process(os.path.join(root, f))
+
+ for dir in dirs:
+ if os.path.islink(os.path.join(root, dir)):
+ process(os.path.join(root, dir))
finally:
os.chdir(prev_dir)