summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-25 22:54:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-26 08:41:39 +0100
commit41a5dbd16b0c9f5f97e7a160830cf7ca5de52ec6 (patch)
treedb12fa6d70cc3bf9ca18ea01269bafb8e9d91092 /meta
parent0ff1d665168ff4b2dbb7b20d61bded1bbf538397 (diff)
downloadpoky-41a5dbd16b0c9f5f97e7a160830cf7ca5de52ec6.tar.gz
package: Improve determinism
Its possible in cases with multiple shlib providers we were not being deterministic. Add in a couple of sorted() calls to fix the shlibs and pkgconfig cases with this potential issue. (From OE-Core rev: 5b9a4214ee17e1a39dd5a1742f2ac5ed25a11310) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass2
-rw-r--r--meta/lib/oe/package.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 8b89fb1129..e67bb5bd97 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1924,7 +1924,7 @@ python package_do_pkgconfig () {
1924 for dir in reversed(shlibs_dirs): 1924 for dir in reversed(shlibs_dirs):
1925 if not os.path.exists(dir): 1925 if not os.path.exists(dir):
1926 continue 1926 continue
1927 for file in os.listdir(dir): 1927 for file in sorted(os.listdir(dir)):
1928 m = re.match(r'^(.*)\.pclist$', file) 1928 m = re.match(r'^(.*)\.pclist$', file)
1929 if m: 1929 if m:
1930 pkg = m.group(1) 1930 pkg = m.group(1)
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index b59513227b..b8585d4253 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -265,7 +265,7 @@ def read_shlib_providers(d):
265 bb.debug(2, "Reading shlib providers in %s" % (dir)) 265 bb.debug(2, "Reading shlib providers in %s" % (dir))
266 if not os.path.exists(dir): 266 if not os.path.exists(dir):
267 continue 267 continue
268 for file in os.listdir(dir): 268 for file in sorted(os.listdir(dir)):
269 m = list_re.match(file) 269 m = list_re.match(file)
270 if m: 270 if m:
271 dep_pkg = m.group(1) 271 dep_pkg = m.group(1)