From 3f8febc4212fbd3485ac9bdd4ac71b8fb0a05693 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 29 Mar 2016 16:09:52 +0100 Subject: [PATCH] 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 --- lib/bb/cooker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) -- 2.47.3