From: Wes Lindauer Date: Wed, 4 Sep 2019 15:49:56 +0000 (-0400) Subject: bitbake: bitbake: cooker: Ensure bbappends are found in stable order X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f73db2708826ab4b8604bac7289f68745b352a9a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git bitbake: bitbake: cooker: Ensure bbappends are found in stable order Thanks to wildcards in bbappend filenames, it's possible to have multiple bbappends that apply to the same recipe in the same directory. In order to get sstate hits between different workspaces, we want to apply those bbappend files in a consistent order. Since readdir() returns files in a non-deterministic order between workspaces (based on inode number and/or time of creation), we'll need to sort its result in order to have any consistency. (Bitbake rev: 94c0c7f15c7a6244a8576ed948ffc21afb96ba82) Signed-off-by: Wes Lindauer Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index e46868ddd0f..5840aa75e0c 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -1852,6 +1852,7 @@ class CookerCollectFiles(object): (bbappend, filename) = b if (bbappend == f) or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])): filelist.append(filename) + filelist.sort() return filelist def collection_priorities(self, pkgfns, d):