bitbake: cooker: Ensure bbappend order is deterministic

Currently bbappend files in a layer are applied in the order they're
found on disk (as reported by glob) which means things are not
deterministic.

By sorting the glob results, the order becomes deterministic, the parsing
order for .bb files also should be deterministic as a result of this change.

[YOCTO #9138]

(Bitbake rev: 3f8febc4212fbd3485ac9bdd4ac71b8fb0a05693)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2016-03-29 16:09:52 +01:00
parent 292c3e82e3
commit 1ca71e5178

View File

@@ -1768,7 +1768,8 @@ class CookerCollectFiles(object):
globbed = glob.glob(f)
if not globbed and os.path.exists(f):
globbed = [f]
for g in globbed:
# glob gives files in order on disk. Sort to be deterministic.
for g in sorted(globbed):
if g not in newfiles:
newfiles.append(g)