diff options
Diffstat (limited to 'meta/classes-global/staging.bbclass')
-rw-r--r-- | meta/classes-global/staging.bbclass | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass index 3678a1b441..c2213ffa2b 100644 --- a/meta/classes-global/staging.bbclass +++ b/meta/classes-global/staging.bbclass | |||
@@ -652,10 +652,17 @@ python do_prepare_recipe_sysroot () { | |||
652 | addtask do_prepare_recipe_sysroot before do_configure after do_fetch | 652 | addtask do_prepare_recipe_sysroot before do_configure after do_fetch |
653 | 653 | ||
654 | python staging_taskhandler() { | 654 | python staging_taskhandler() { |
655 | EXCLUDED_TASKS = ( | ||
656 | "do_prepare_recipe_sysroot", | ||
657 | "do_create_spdx", | ||
658 | ) | ||
655 | bbtasks = e.tasklist | 659 | bbtasks = e.tasklist |
656 | for task in bbtasks: | 660 | for task in bbtasks: |
661 | if task in EXCLUDED_TASKS: | ||
662 | continue | ||
663 | |||
657 | deps = d.getVarFlag(task, "depends") | 664 | deps = d.getVarFlag(task, "depends") |
658 | if task != 'do_prepare_recipe_sysroot' and (task == "do_configure" or (deps and "populate_sysroot" in deps)): | 665 | if task == "do_configure" or (deps and "populate_sysroot" in deps): |
659 | d.prependVarFlag(task, "prefuncs", "extend_recipe_sysroot ") | 666 | d.prependVarFlag(task, "prefuncs", "extend_recipe_sysroot ") |
660 | } | 667 | } |
661 | staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess" | 668 | staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess" |