diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-18 12:46:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-18 23:34:39 +0100 |
commit | 13881ed2bd9e8ff7e64e68fd8289bb96be712e5d (patch) | |
tree | 73df6cf1c1275d63cc6de88e54352d427be8582d /meta/classes | |
parent | 97c592166638f1dbae9172c947b77248c8c78aca (diff) | |
download | poky-13881ed2bd9e8ff7e64e68fd8289bb96be712e5d.tar.gz |
staging: Drop clean_recipe_sysroot
With recent changes to runqueue, this fuction is unsafe as setscene tasks can run
at the same time as normal ones and doing things before do_fetch no longer
offers any guarantees.
There is other code which cleans out things from the sysroots as tasks rerun so
we should rely upon that instead.
(From OE-Core rev: 27ce69861edb7e52078b59ebf8fefc9201e9a228)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/staging.bbclass | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 94c85248da..cdc342dbb9 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -577,17 +577,6 @@ python do_prepare_recipe_sysroot () { | |||
577 | } | 577 | } |
578 | addtask do_prepare_recipe_sysroot before do_configure after do_fetch | 578 | addtask do_prepare_recipe_sysroot before do_configure after do_fetch |
579 | 579 | ||
580 | # Clean out the recipe specific sysroots before do_fetch | ||
581 | # (use a prefunc so we can order before extend_recipe_sysroot if it gets added) | ||
582 | python clean_recipe_sysroot() { | ||
583 | # We remove these stamps since we're removing any content they'd have added with | ||
584 | # cleandirs. This removes the sigdata too, likely not a big deal, | ||
585 | oe.path.remove(d.getVar("STAMP") + "*addto_recipe_sysroot*") | ||
586 | return | ||
587 | } | ||
588 | clean_recipe_sysroot[cleandirs] += "${RECIPE_SYSROOT} ${RECIPE_SYSROOT_NATIVE}" | ||
589 | do_fetch[prefuncs] += "clean_recipe_sysroot" | ||
590 | |||
591 | python staging_taskhandler() { | 580 | python staging_taskhandler() { |
592 | bbtasks = e.tasklist | 581 | bbtasks = e.tasklist |
593 | for task in bbtasks: | 582 | for task in bbtasks: |