diff options
| author |   Wes Lindauer <wesley.lindauer@gmail.com> | 2019-09-04 11:49:56 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-07 13:08:54 +0100 |
| commit | f73db2708826ab4b8604bac7289f68745b352a9a (patch) | |
| tree | cd55ee8ac34b883aa8d6ba91518cac9d7f731cf6 /bitbake | |
| parent | 01bf7f5279b5f13eb014efe07404bf158cbed99b (diff) | |
| download | openembedded-core-contrib-f73db2708826ab4b8604bac7289f68745b352a9a.tar.gz | |
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 <wesley.lindauer@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index e46868ddd0..5840aa75e0 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): |