[oe-commits] [openembedded-core] 04/05: staging: Allow BB_LIMITEDDEPS to avoid BB_TASKDEPDATA

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch pyro
in repository openembedded-core.

commit e962e257f4c124869953d1fbb3da7dbf564f818a
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon May 8 11:56:22 2017 +0100

    staging: Allow BB_LIMITEDDEPS to avoid BB_TASKDEPDATA
    
    In the limited dependency case we don't use any of the data from
    BB_TASKDEPDATA. Restructure the code so this variable doesn't have
    to be set. This allows the function to be called from other contexts
    without creating artificial constructs. There should be no functional
    change, behaviour remains unchanged.
    
    (From OE-Core rev: 71e5243e3ebadb90b45fe418dac3eaa2c1b896bd)
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/staging.bbclass | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 565638f..9c26794 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -331,12 +331,26 @@ python extend_recipe_sysroot() {
 
     taskdepdata = d.getVar("BB_TASKDEPDATA", False)
     mytaskname = d.getVar("BB_RUNTASK")
+    if mytaskname.endswith("_setscene"):
+        mytaskname = mytaskname.replace("_setscene", "")
     workdir = d.getVar("WORKDIR")
     #bb.warn(str(taskdepdata))
     pn = d.getVar("PN")
 
-    if mytaskname.endswith("_setscene"):
-        mytaskname = mytaskname.replace("_setscene", "")
+    stagingdir = d.getVar("STAGING_DIR")
+    sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests"
+    recipesysroot = d.getVar("RECIPE_SYSROOT")
+    recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
+    current_variant = d.getVar("BBEXTENDVARIANT")
+
+    # Detect bitbake -b usage
+    nodeps = d.getVar("BB_LIMITEDDEPS") or False
+    if nodeps:
+        lock = bb.utils.lockfile(recipesysroot + "/sysroot.lock")
+        staging_populate_sysroot_dir(recipesysroot, recipesysrootnative, True, d)
+        staging_populate_sysroot_dir(recipesysroot, recipesysrootnative, False, d)
+        bb.utils.unlockfile(lock)
+        return
 
     start = None
     configuredeps = []
@@ -441,20 +455,6 @@ python extend_recipe_sysroot() {
 
     bb.note("\n".join(msgbuf))
 
-    stagingdir = d.getVar("STAGING_DIR")
-    sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests"
-    recipesysroot = d.getVar("RECIPE_SYSROOT")
-    recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
-    current_variant = d.getVar("BBEXTENDVARIANT")
-
-    # Detect bitbake -b usage
-    nodeps = d.getVar("BB_LIMITEDDEPS") or False
-    if nodeps:
-        lock = bb.utils.lockfile(recipesysroot + "/sysroot.lock")
-        staging_populate_sysroot_dir(recipesysroot, recipesysrootnative, True, d)
-        staging_populate_sysroot_dir(recipesysroot, recipesysrootnative, False, d)
-        bb.utils.unlockfile(lock)
-
     depdir = recipesysrootnative + "/installeddeps"
     bb.utils.mkdirhier(depdir)
     bb.utils.mkdirhier(sharedmanifests)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.