summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2021-10-04 04:35:55 -1000
committerSteve Sakoman <steve@sakoman.com>2021-10-19 04:04:49 -1000
commitc6a5c4a72de7590b4ac8f5e1bd4c1e83567ef468 (patch)
treea73878d701bcbfa0ac702d40279ff6f1bb5e086f
parenta8ec8c9eaed898c3cc719efd87a2f4296c6304a6 (diff)
downloadopenembedded-core-c6a5c4a72de7590b4ac8f5e1bd4c1e83567ef468.tar.gz
util-linux: Fix reproducibility
Sort the list of files to ensure the pkgdata output is deterministic. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 3a55194f90e11da5671b24391a4aaf2b86a8e1e6) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index af4c0b9974..7b780352be 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -59,12 +59,13 @@ python util_linux_binpackages () {
continue
pkg = os.path.basename(os.readlink(file))
- extras[pkg] = extras.get(pkg, '') + ' ' + file.replace(dvar, '', 1)
+ extras.setdefault(pkg, [])
+ extras[pkg].append(file.replace(dvar, '', 1))
pn = d.getVar('PN')
for pkg, links in extras.items():
of = d.getVar('FILES_' + pn + '-' + pkg)
- links = of + links
+ links = of + " " + " ".join(sorted(links))
d.setVar('FILES_' + pn + '-' + pkg, links)
}