Skip to contentSkip to conversation

Revert "bitbake: cooker: Ensure bbappends are found in stable order"

PATCH In review Martin Jansa 2 participants 2 messages Sep 12, 2019 – Sep 13, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "bitbake: cooker: Ensure bbappends are found in stable order"

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.

---
 lib/bb/cooker.py | 1 -
 1 file changed, 1 deletion(-)
lib/bb/cooker.py +0 -1
index 89d1916e..a0e60024 100644
@@ -1855,7 +1855,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):
Signature · 1 line
2.17.1
#1 lore raw
Quoted 6 lines · Martin Jansa

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.

Would you be able to write a little test case to verify that this sort of behavioural change doesn't sneak in again?

Ross