From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 29 Mar 2016 15:09:52 +0000 (+0100)
Subject: cooker: Ensure bbappend order is deterministic
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f8febc4212fbd3485ac9bdd4ac71b8fb0a05693;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 96cefc73fd5..771932a82d3 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -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)