diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2019-09-12 12:36:27 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-16 23:02:45 +0100 |
| commit | 85f8e4c04a6e665bcf2ee5565fca45b6814fd65c (patch) | |
| tree | 6b547b4079ba6dd2b381df18afb288f47d165103 | |
| parent | 48c9259eae6f8ca9bd7b4fb9c41f8b26c086738d (diff) | |
| download | poky-85f8e4c04a6e665bcf2ee5565fca45b6814fd65c.tar.gz | |
bitbake: 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.
(Bitbake rev: 2dc862237dba82da37c8ac9289e0a21409b1305c)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 5840aa75e0..e46868ddd0 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
| @@ -1852,7 +1852,6 @@ class CookerCollectFiles(object): | |||
| 1852 | (bbappend, filename) = b | 1852 | (bbappend, filename) = b |
| 1853 | if (bbappend == f) or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])): | 1853 | if (bbappend == f) or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])): |
| 1854 | filelist.append(filename) | 1854 | filelist.append(filename) |
| 1855 | filelist.sort() | ||
| 1856 | return filelist | 1855 | return filelist |
| 1857 | 1856 | ||
| 1858 | def collection_priorities(self, pkgfns, d): | 1857 | def collection_priorities(self, pkgfns, d): |