diff options
author | Steve Sakoman <steve@sakoman.com> | 2021-10-04 04:35:55 -1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-23 23:14:17 +0100 |
commit | 45ef46bb4c221ef04838b2cf8c01bc4b24f5fe26 (patch) | |
tree | dd0a3e0648bf82d6cde39841a0c80b35d6f9a7fd /meta/recipes-core | |
parent | 210be5440b9b469cb9b63eaa1d2a6468b37abe6c (diff) | |
download | poky-45ef46bb4c221ef04838b2cf8c01bc4b24f5fe26.tar.gz |
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 <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3a55194f90e11da5671b24391a4aaf2b86a8e1e6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 5 |
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 () { | |||
59 | continue | 59 | continue |
60 | 60 | ||
61 | pkg = os.path.basename(os.readlink(file)) | 61 | pkg = os.path.basename(os.readlink(file)) |
62 | extras[pkg] = extras.get(pkg, '') + ' ' + file.replace(dvar, '', 1) | 62 | extras.setdefault(pkg, []) |
63 | extras[pkg].append(file.replace(dvar, '', 1)) | ||
63 | 64 | ||
64 | pn = d.getVar('PN') | 65 | pn = d.getVar('PN') |
65 | for pkg, links in extras.items(): | 66 | for pkg, links in extras.items(): |
66 | of = d.getVar('FILES_' + pn + '-' + pkg) | 67 | of = d.getVar('FILES_' + pn + '-' + pkg) |
67 | links = of + links | 68 | links = of + " " + " ".join(sorted(links)) |
68 | d.setVar('FILES_' + pn + '-' + pkg, links) | 69 | d.setVar('FILES_' + pn + '-' + pkg, links) |
69 | } | 70 | } |
70 | 71 | ||