diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-29 13:37:02 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-30 16:44:41 +0100 |
commit | f691e4104f1c09246676e83351aa1dd3431c5793 (patch) | |
tree | e3b826e429da4baea57e7bc74cedb4257ce349f9 /meta/lib/oe/package.py | |
parent | 6bf811e9bda84e12791328227b5834dd5ce83ce5 (diff) | |
download | poky-f691e4104f1c09246676e83351aa1dd3431c5793.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: bbbd16f96f4db392e0bd38da4c2ef8fbb4883938)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/package.py')
-rw-r--r-- | meta/lib/oe/package.py | 2 |
1 files changed, 1 insertions, 1 deletions
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) |