From c22953e8ec6d9dcf9f0877031ede61cd012f9493 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 8 May 2017 11:56:22 +0100 Subject: [PATCH] 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 --- 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 565638f48d..9c2679406b 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)