Skip to contentSkip to conversation

staging.bbclass: do not add extend_recipe_sysroot to prefuncs of prepare_recipe_sysroot

PATCH New [email protected] 1 participant 1 message May 23, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging.bbclass: do not add extend_recipe_sysroot to prefuncs of prepare_recipe_sysroot

From: Chen Qi <[email protected]>

When running prepare_recipe_sysroot task, the extend_recipe_sysroot is run twice.

What prepare_recipe_sysroot does is executing extend_recipe_sysroot, there's no need to add extend_recipe_sysroot to its prefuncs.

---
 meta/classes-global/staging.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-global/staging.bbclass +1 -1
index 6eefba4d73..3a300c32e7 100644
@@ -654,7 +654,7 @@ python staging_taskhandler() {
     bbtasks = e.tasklist
     for task in bbtasks:
         deps = d.getVarFlag(task, "depends")
-        if task == "do_configure" or (deps and "populate_sysroot" in deps):
+        if task != 'do_prepare_recipe_sysroot' and (task == "do_configure" or (deps and "populate_sysroot" in deps)):
             d.prependVarFlag(task, "prefuncs", "extend_recipe_sysroot ")
 }
 staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess"
Signature · 1 line
2.40.0