From e0b6c93875666e5ce93bc78698515bfa502c2162 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 19 Aug 2020 11:16:56 -0500 Subject: 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 Signed-off-by: Richard Purdie (cherry picked from commit 23cc846c92219c5cbe3fc6a0024579195d3cbd78) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 099d0459f3..2d96e646da 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -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: -- cgit v1.2.3-54-g00ecf