From 7bed4a0ed5cd63bba03f44a3832087bd72d0c021 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 22 May 2023 20:35:48 -0700 Subject: staging.bbclass: do not add extend_recipe_sysroot to prefuncs of prepare_recipe_sysroot 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. (From OE-Core rev: 08e561035255e765e4293d4031115ea308cc29d3) Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit bf7584a2ac16ee46ff5b41536b06bb46d0cbada7) Signed-off-by: Steve Sakoman --- meta/classes-global/staging.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass index a058d344fd..664a9c59b5 100644 --- a/meta/classes-global/staging.bbclass +++ b/meta/classes-global/staging.bbclass @@ -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" -- cgit v1.2.3-54-g00ecf