cooker: Ensure bbappend order is deterministic

PATCH New Richard Purdie 1 participant 1 message Mar 29, 2016

Share & tools

Richard Purdie

author

2016-03-29 15:09 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

bitbake/lib/bb/cooker.py +2 -1

index 3014697..6601dff 100644
@@ -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)