From: Wes Lindauer <wesley.lindauer@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] bitbake: cooker: Ensure bbappends are found in stable order
Date: Wed, 28 Aug 2019 17:38:14 -0400 [thread overview]
Message-ID: <20190828213814.5204-1-wesley.lindauer@gmail.com> (raw)
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@gmail.com>
---
bitbake/lib/bb/cooker.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 0607fcc708..a9ee142aa5 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1869,6 +1869,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):
--
2.14.5
next reply other threads:[~2019-08-28 21:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-28 21:38 Wes Lindauer [this message]
2019-08-28 22:02 ` ✗ patchtest: failure for bitbake: cooker: Ensure bbappends are found in stable order Patchwork
-- strict thread matches above, loose matches on Subject: below --
2019-09-11 17:07 [PATCH] " Peter Kjellerstedt
2019-09-11 17:12 ` Mark Hatle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190828213814.5204-1-wesley.lindauer@gmail.com \
--to=wesley.lindauer@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox