]> code.ossystems Code Review - openembedded-core.git/commitdiff
rm_work: sort the value of do_build dependencies
authorMing Liu <liu.ming50@gmail.com>
Thu, 7 Mar 2019 16:56:46 +0000 (17:56 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 9 Mar 2019 14:41:20 +0000 (14:41 +0000)
This fixes some 'basehash changed' errors when rm_work is being
inherited.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/rm_work.bbclass

index 10e134b95859b8d705489b8c71405ffb9d4fda39..c478f4a1870c665a2c084035d68d3309d820bc05 100644 (file)
@@ -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: