From: Chen Qi <Qi.Chen@windriver.com>
Date: Tue, 23 May 2023 03:35:48 +0000 (-0700)
Subject: staging.bbclass: do not add extend_recipe_sysroot to prefuncs of prepare_recipe_sysroot
X-Git-Tag: uninative-3.10~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf7584a2ac16ee46ff5b41536b06bb46d0cbada7;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

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.

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>
---

diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass
index 6eefba4d733..3a300c32e7c 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"