diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-29 13:37:02 +0200 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2019-08-10 07:08:18 -0700 |
| commit | 184672b59e4c20ec34da0974fa59a045f9d478c1 (patch) | |
| tree | 67da32bc59a93eca4f62f08367f58a284a86e74c | |
| parent | fd872a77f8409da526203420827cef3f79622d78 (diff) | |
| download | openembedded-core-contrib-184672b59e4c20ec34da0974fa59a045f9d478c1.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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -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 eef1f7b945..2c44fc1f0d 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1918,7 +1918,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) |