From 45ef46bb4c221ef04838b2cf8c01bc4b24f5fe26 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Mon, 4 Oct 2021 04:35:55 -1000 Subject: util-linux: Fix reproducibility Sort the list of files to ensure the pkgdata output is deterministic. (From OE-Core rev: c6a5c4a72de7590b4ac8f5e1bd4c1e83567ef468) Signed-off-by: Richard Purdie (cherry picked from commit 3a55194f90e11da5671b24391a4aaf2b86a8e1e6) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta') 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) } -- cgit v1.2.3-54-g00ecf