All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 5/9] util-linux: Fix reproducibility
Date: Fri,  1 Oct 2021 14:50:36 +0100	[thread overview]
Message-ID: <20211001135040.2251283-5-richard.purdie@linuxfoundation.org> (raw)
In-Reply-To: <20211001135040.2251283-1-richard.purdie@linuxfoundation.org>

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 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux_2.37.2.bb b/meta/recipes-core/util-linux/util-linux_2.37.2.bb
index 6f2808cc441..d609c30067f 100644
--- a/meta/recipes-core/util-linux/util-linux_2.37.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.37.2.bb
@@ -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)
 }
 
-- 
2.32.0



  parent reply	other threads:[~2021-10-01 13:50 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-01 13:50 [PATCH 1/9] rpm: Ensure compression parallelism isn't coded into rpms Richard Purdie
2021-10-01 13:50 ` [PATCH 2/9] package: Ensure pclist files are deterministic and don't use full paths Richard Purdie
2021-10-01 13:50 ` [PATCH 3/9] gnupg: Be deterministic about sendmail Richard Purdie
2021-10-01 13:50 ` [PATCH 4/9] mesa: Ensure megadrivers runtime mappings are deterministic Richard Purdie
2021-10-01 13:50 ` Richard Purdie [this message]
2021-10-01 13:50 ` [PATCH 6/9] libtool: Allow libtool-cross to reproduce Richard Purdie
2021-10-01 13:50 ` [PATCH 7/9] gobject-introspection: Don't write $HOME into scripts Richard Purdie
2021-10-01 13:50 ` [PATCH 8/9] oeqa/selftest/bbtests: Add uuid to force build test Richard Purdie
2021-10-01 13:50 ` [PATCH 9/9] image: Exclude IMAGE_VERSION_SUFFIX from expansion in image tasks Richard Purdie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211001135040.2251283-5-richard.purdie@linuxfoundation.org \
    --to=richard.purdie@linuxfoundation.org \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.