mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 12:32:12 +02:00
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>
This commit is contained in:
@@ -1924,7 +1924,7 @@ python package_do_pkgconfig () {
|
||||
for dir in reversed(shlibs_dirs):
|
||||
if not os.path.exists(dir):
|
||||
continue
|
||||
for file in os.listdir(dir):
|
||||
for file in sorted(os.listdir(dir)):
|
||||
m = re.match(r'^(.*)\.pclist$', file)
|
||||
if m:
|
||||
pkg = m.group(1)
|
||||
|
||||
@@ -265,7 +265,7 @@ def read_shlib_providers(d):
|
||||
bb.debug(2, "Reading shlib providers in %s" % (dir))
|
||||
if not os.path.exists(dir):
|
||||
continue
|
||||
for file in os.listdir(dir):
|
||||
for file in sorted(os.listdir(dir)):
|
||||
m = list_re.match(file)
|
||||
if m:
|
||||
dep_pkg = m.group(1)
|
||||
|
||||
Reference in New Issue
Block a user