[oe-commits] [openembedded-core] 10/10: classes/package: Sort ELF file list

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit a03e25446b26dbd11d9ca67f95c28745f8c875f7
Author: Joshua Watt <jpewhacker at gmail.com>
AuthorDate: Mon Jun 3 10:29:47 2019 -0500

    classes/package: Sort ELF file list
    
    Sorts the list of detected ELF files by path before processing. This
    ensures that when multiple files are hardlinked together the first one
    found is always the same. This is required to have reproducible builds.
    
    Signed-off-by: Joshua Watt <JPEWhacker at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/package.bbclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 4c0a859..0694855 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1005,6 +1005,12 @@ python split_and_strip_files () {
                 symlinks[file] = target
 
         results = oe.utils.multiprocess_launch(oe.package.is_elf, checkelf.keys(), d)
+
+        # Sort results by file path. This ensures that the files are always
+        # processed in the same order, which is important to make sure builds
+        # are reproducible when dealing with hardlinks
+        results.sort(key=lambda x: x[0])
+
         for (file, elf_file) in results:
             # It's a file (or hardlink), not a link
             # ...but is it ELF, and is it already stripped?

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.