mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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>
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user