]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
bitbake: Revert "bitbake: cooker: Ensure bbappends are found in stable order"
authorMartin Jansa <martin.jansa@gmail.com>
Thu, 12 Sep 2019 12:36:27 +0000 (12:36 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 16 Sep 2019 22:02:45 +0000 (23:02 +0100)
This reverts commit 94c0c7f15c7a6244a8576ed948ffc21afb96ba82.

This ignores the layer priority, making the issue much worse.
E.g. I'm seeing a lot of failures caused by missing users, because
base-passwd bbappends applied in unexpected order caused different
passwd.master to be found in re-ordered FILESPATH.

(Bitbake rev: 2dc862237dba82da37c8ac9289e0a21409b1305c)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bitbake/lib/bb/cooker.py

index 5840aa75e0cabef52f968c871a5ae4b6144ddbc7..e46868ddd0f3ecca1079104223988ea76c16a3b7 100644 (file)
@@ -1852,7 +1852,6 @@ 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):