mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

package: Improve determinism

Browse Source 
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>
This commit is contained in:
Richard Purdie
2019-07-25 22:54:34 +01:00
parent 0ff1d66516
commit 41a5dbd16b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/package.bbclass
+1 -1
View File
@@ -1924,7 +1924,7 @@ python package_do_pkgconfig () {
for dir in reversed(shlibs_dirs): for dir in reversed(shlibs_dirs):
if not os.path.exists(dir): if not os.path.exists(dir):
continue continue
for file in os.listdir(dir): for file in sorted(os.listdir(dir)):
m = re.match(r'^(.*)\.pclist$', file) m = re.match(r'^(.*)\.pclist$', file)
if m: if m:
pkg = m.group(1) pkg = m.group(1)
meta/lib/oe/package.py
+1 -1
View File
@@ -265,7 +265,7 @@ def read_shlib_providers(d):
bb.debug(2, "Reading shlib providers in %s" % (dir)) bb.debug(2, "Reading shlib providers in %s" % (dir))
if not os.path.exists(dir): if not os.path.exists(dir):
continue continue
for file in os.listdir(dir): for file in sorted(os.listdir(dir)):
m = list_re.match(file) m = list_re.match(file)
if m: if m:
dep_pkg = m.group(1) dep_pkg = m.group(1)