]> 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)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 20 Aug 2020 14:28:57 +0000 (15:28 +0100)
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>
meta/classes/package.bbclass

index f8dc1bb4684015cb85090b95e0b78c790ad43bd6..7a36262eb600059dc21745c0314ca7a661ebb77b 100644 (file)
@@ -1936,7 +1936,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: