diff options
| author | Ming Liu <liu.ming50@gmail.com> | 2019-03-07 17:56:46 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-24 16:48:38 +0000 |
| commit | d4e6497ba2523243d0e3f3fa495adddab5e6928f (patch) | |
| tree | 1cc9cc2138fba94169071ec5c346988cac402845 /meta | |
| parent | 5b80b1eabfa14eb018780edafadc09ac2bd74257 (diff) | |
| download | poky-d4e6497ba2523243d0e3f3fa495adddab5e6928f.tar.gz | |
rm_work: sort the value of do_build dependencies
This fixes some 'basehash changed' errors when rm_work is being
inherited.
(From OE-Core rev: e74158b6cc1d683ab14ef5d47ec531f986fc2259)
(From OE-Core rev: 8aed35802270345844239406266be37d66ba86c7)
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/rm_work.bbclass | 3 |
1 files changed, 1 insertions, 2 deletions
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() { | |||
| 164 | 164 | ||
| 165 | # Determine what do_build depends upon, without including do_build | 165 | # Determine what do_build depends upon, without including do_build |
| 166 | # itself or our own special do_rm_work_all. | 166 | # itself or our own special do_rm_work_all. |
| 167 | deps = set(bb.build.preceedtask('do_build', True, d)) | 167 | deps = sorted((set(bb.build.preceedtask('do_build', True, d))).difference(('do_build', 'do_rm_work_all')) or "") |
| 168 | deps.difference_update(('do_build', 'do_rm_work_all')) | ||
| 169 | 168 | ||
| 170 | # deps can be empty if do_build doesn't exist, e.g. *-inital recipes | 169 | # deps can be empty if do_build doesn't exist, e.g. *-inital recipes |
| 171 | if not deps: | 170 | if not deps: |