Skip to contentSkip to conversation

bitbake: cooker: Ensure bbappends are found in stable order

PATCH In review Wes Lindauer 2 participants 2 messages Aug 28, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 bitbake/lib/bb/cooker.py | 1 +
 1 file changed, 1 insertion(+)
bitbake/lib/bb/cooker.py +1 -0
index 0607fcc708..a9ee142aa5 100644
@@ -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):
Signature · 1 line
2.14.5
#1 lore raw

✗ patchtest: failure for bitbake: cooker: Ensure bbappends are found in stable order

== Series Details ==

Series: bitbake: cooker: Ensure bbappends are found in stable order
Revision: 1
URL : https://patchwork.openembedded.org/series/19547/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series sent to the wrong mailing list or some patches from the series correspond to different mailing lists [test_target_mailing_list]

  Suggested fix    Send the series again to the correct mailing list (ML)
  Suggested ML     [email protected] [http://git.openembedded.org/bitbake/]
  Patch's path:    bitbake/lib/bb/cooker.py

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 684fc36402)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe