diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2023-05-22 20:35:48 -0700 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-06-23 04:16:41 -1000 |
commit | a81330c455fe0f9a467f1e80dd508c0092f6a18c (patch) | |
tree | d3f31150dd13956196a631861d5284b65446f2a0 | |
parent | 49b2b70749b438dca47cc2bb49b84aa7369126e9 (diff) | |
download | poky-a81330c455fe0f9a467f1e80dd508c0092f6a18c.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: dad053c4b99d4aefebe40459500ad53a2b458fa0)
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/staging.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 044873c9ae..a78839bdc2 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -648,7 +648,7 @@ python staging_taskhandler() { | |||
648 | bbtasks = e.tasklist | 648 | bbtasks = e.tasklist |
649 | for task in bbtasks: | 649 | for task in bbtasks: |
650 | deps = d.getVarFlag(task, "depends") | 650 | deps = d.getVarFlag(task, "depends") |
651 | if task == "do_configure" or (deps and "populate_sysroot" in deps): | 651 | if task != 'do_prepare_recipe_sysroot' and (task == "do_configure" or (deps and "populate_sysroot" in deps)): |
652 | d.prependVarFlag(task, "prefuncs", "extend_recipe_sysroot ") | 652 | d.prependVarFlag(task, "prefuncs", "extend_recipe_sysroot ") |
653 | } | 653 | } |
654 | staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess" | 654 | staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess" |