diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-25 22:54:34 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-26 08:41:02 +0100 |
| commit | 5b9a4214ee17e1a39dd5a1742f2ac5ed25a11310 (patch) | |
| tree | b7c68e21e89d158ee5863997337ad8733dcd2e19 | |
| parent | 1b562506d46ee54414dbdbee9c3f6a3345fa16d0 (diff) | |
| download | openembedded-core-contrib-5b9a4214ee17e1a39dd5a1742f2ac5ed25a11310.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package.bbclass | 2 | ||||
| -rw-r--r-- | meta/lib/oe/package.py | 2 |
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 () { 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) 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): 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) |