]> code.ossystems Code Review - openembedded-core.git/commitdiff
package.bbclass: Sort shlib2 output for hash equivalency
authorMark Hatle <mark.hatle@kernel.crashing.org>
Wed, 19 Aug 2020 16:16:56 +0000 (11:16 -0500)
committerSteve Sakoman <steve@sakoman.com>
Sat, 29 Aug 2020 17:18:47 +0000 (07:18 -1000)
The output was unsorted, so different versions of python, different input
ordering could have have changed the files, and thus changed the hashes
making the system think the output was different, even when unmodified.

Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 23cc846c92219c5cbe3fc6a0024579195d3cbd78)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes/package.bbclass

index 099d0459f33b280ba6873be4a36bc30e8c705897..2d96e646dad9d8f54c04ec367539a6c9895bbd1b 100644 (file)
@@ -1842,7 +1842,7 @@ python package_do_shlibs() {
         shlibs_file = os.path.join(shlibswork_dir, pkg + ".list")
         if len(sonames):
             with open(shlibs_file, 'w') as fd:
-                for s in sonames:
+                for s in sorted(sonames):
                     if s[0] in shlib_provider and s[1] in shlib_provider[s[0]]:
                         (old_pkg, old_pkgver) = shlib_provider[s[0]][s[1]]
                         if old_pkg != pkg: