summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
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-08-20 14:30:07 (GMT)
commit85869d615bb7a01083904af978e220997ef74a6c (patch)
tree6591754471b2edae8369b7e48d9baeb0e8daefdc /meta/classes/package.bbclass
parentb75ae656fa5b100326f31920bc948e779914c04f (diff)
downloadpoky-85869d615bb7a01083904af978e220997ef74a6c.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: 23cc846c92219c5cbe3fc6a0024579195d3cbd78) Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-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 f8dc1bb..7a36262 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1936,7 +1936,7 @@ python package_do_shlibs() {
1936 shlibs_file = os.path.join(shlibswork_dir, pkg + ".list") 1936 shlibs_file = os.path.join(shlibswork_dir, pkg + ".list")
1937 if len(sonames): 1937 if len(sonames):
1938 with open(shlibs_file, 'w') as fd: 1938 with open(shlibs_file, 'w') as fd:
1939 for s in sonames: 1939 for s in sorted(sonames):
1940 if s[0] in shlib_provider and s[1] in shlib_provider[s[0]]: 1940 if s[0] in shlib_provider and s[1] in shlib_provider[s[0]]:
1941 (old_pkg, old_pkgver) = shlib_provider[s[0]][s[1]] 1941 (old_pkg, old_pkgver) = shlib_provider[s[0]][s[1]]
1942 if old_pkg != pkg: 1942 if old_pkg != pkg: