[oe-commits] [bitbake] 01/02: bitbake: cooker: Ensure bbappends are found in stable order

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository bitbake.

commit 94c0c7f15c7a6244a8576ed948ffc21afb96ba82
Author: Wes Lindauer <wesley.lindauer at gmail.com>
AuthorDate: Wed Sep 4 11:49:56 2019 -0400

    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.
    
    Signed-off-by: Wes Lindauer <wesley.lindauer at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/cooker.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index e46868d..5840aa7 100644
--- a/lib/bb/cooker.py
+++ b/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):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.