]> code.ossystems Code Review - openembedded-core.git/commitdiff
util-linux: Fix reproducibility
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 30 Sep 2021 00:46:45 +0000 (01:46 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 1 Oct 2021 13:52:24 +0000 (14:52 +0100)
Sort the list of files to ensure the pkgdata output is deterministic.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/util-linux/util-linux_2.37.2.bb

index 6f2808cc441dba1c357465959d2d99847a562323..d609c30067ff98c19de514b03e60f92940c6b3c4 100644 (file)
@@ -37,12 +37,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)
 }