summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2023-05-22 20:35:48 -0700
committerSteve Sakoman <steve@sakoman.com>2023-06-14 04:14:25 -1000
commit7bed4a0ed5cd63bba03f44a3832087bd72d0c021 (patch)
treed9ba42de7df8c9d10008d5a34264c1123bca18ae
parentb3242c03f69ff43dc4e4e10881b209ff6f7dda72 (diff)
downloadpoky-7bed4a0ed5cd63bba03f44a3832087bd72d0c021.tar.gz
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 <Qi.Chen@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit bf7584a2ac16ee46ff5b41536b06bb46d0cbada7) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/classes-global/staging.bbclass2
1 files changed, 1 insertions, 1 deletions
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() {
654 bbtasks = e.tasklist 654 bbtasks = e.tasklist
655 for task in bbtasks: 655 for task in bbtasks:
656 deps = d.getVarFlag(task, "depends") 656 deps = d.getVarFlag(task, "depends")
657 if task == "do_configure" or (deps and "populate_sysroot" in deps): 657 if task != 'do_prepare_recipe_sysroot' and (task == "do_configure" or (deps and "populate_sysroot" in deps)):
658 d.prependVarFlag(task, "prefuncs", "extend_recipe_sysroot ") 658 d.prependVarFlag(task, "prefuncs", "extend_recipe_sysroot ")
659} 659}
660staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess" 660staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess"