summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@kernel.crashing.org>2020-08-19 16:16:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-02 15:04:37 (GMT)
commite0b6c93875666e5ce93bc78698515bfa502c2162 (patch)
treeaef68774e7a1e940597ade0b3f8208f607be57c1 /meta/classes
parent966323d80ecc0c443a70a77f67f0d49d1685396f (diff)
downloadpoky-e0b6c93875666e5ce93bc78698515bfa502c2162.tar.gz
package.bbclass: Sort shlib2 output for hash equivalency
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. (From OE-Core rev: 07d15b83a998d6a80eba2cf8649486bfe302f94d) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 099d045..2d96e64 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1842,7 +1842,7 @@ python package_do_shlibs() {
1842 shlibs_file = os.path.join(shlibswork_dir, pkg + ".list") 1842 shlibs_file = os.path.join(shlibswork_dir, pkg + ".list")
1843 if len(sonames): 1843 if len(sonames):
1844 with open(shlibs_file, 'w') as fd: 1844 with open(shlibs_file, 'w') as fd:
1845 for s in sonames: 1845 for s in sorted(sonames):
1846 if s[0] in shlib_provider and s[1] in shlib_provider[s[0]]: 1846 if s[0] in shlib_provider and s[1] in shlib_provider[s[0]]:
1847 (old_pkg, old_pkgver) = shlib_provider[s[0]][s[1]] 1847 (old_pkg, old_pkgver) = shlib_provider[s[0]][s[1]]
1848 if old_pkg != pkg: 1848 if old_pkg != pkg: