summaryrefslogtreecommitdiffstats
path: root/meta/classes-global/staging.bbclass
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2023-05-22 20:35:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-05-25 10:29:09 +0100
commitcdd38494f00604fabcae5721c9ca1a3fd5759fe6 (patch)
treeae7feed7aa23125a9380ed53224a51a0af88f3d2 /meta/classes-global/staging.bbclass
parent3dd2eae3812b64cdfd8bfbdcad6cbefd6f6d5d7f (diff)
downloadpoky-cdd38494f00604fabcae5721c9ca1a3fd5759fe6.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: bf7584a2ac16ee46ff5b41536b06bb46d0cbada7) 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>
Diffstat (limited to 'meta/classes-global/staging.bbclass')
-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 6eefba4d73..3a300c32e7 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"