From e74158b6cc1d683ab14ef5d47ec531f986fc2259 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Thu, 7 Mar 2019 17:56:46 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/rm_work.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass index 10e134b958..c478f4a187 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: -- cgit 1.2.3-korg