[oe-commits] [openembedded-core] 05/09: rm_work: sort the value of do_build dependencies

git at git.openembedded.org git at git.openembedded.org
Thu Mar 7 22:23:41 UTC 2019


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 0a4f6e6dfb1b7f8ec6b1a48f3fd9a0579f6b3bf7
Author: Ming Liu <liu.ming50 at gmail.com>
AuthorDate: Thu Mar 7 17:56:46 2019 +0100

    rm_work: sort the value of do_build dependencies
    
    This fixes some 'basehash changed' errors when rm_work is being
    inherited.
    
    Signed-off-by: Ming Liu <liu.ming50 at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/rm_work.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 10e134b..c478f4a 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -164,8 +164,7 @@ python inject_rm_work() {
 
     # Determine what do_build depends upon, without including do_build
     # itself or our own special do_rm_work_all.
-    deps = set(bb.build.preceedtask('do_build', True, d))
-    deps.difference_update(('do_build', 'do_rm_work_all'))
+    deps = sorted((set(bb.build.preceedtask('do_build', True, d))).difference(('do_build', 'do_rm_work_all')) or "")
 
     # deps can be empty if do_build doesn't exist, e.g. *-inital recipes
     if not deps:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list