summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/staging.bbclass32
1 files 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() {
331 331
332 taskdepdata = d.getVar("BB_TASKDEPDATA", False) 332 taskdepdata = d.getVar("BB_TASKDEPDATA", False)
333 mytaskname = d.getVar("BB_RUNTASK") 333 mytaskname = d.getVar("BB_RUNTASK")
334 if mytaskname.endswith("_setscene"):
335 mytaskname = mytaskname.replace("_setscene", "")
334 workdir = d.getVar("WORKDIR") 336 workdir = d.getVar("WORKDIR")
335 #bb.warn(str(taskdepdata)) 337 #bb.warn(str(taskdepdata))
336 pn = d.getVar("PN") 338 pn = d.getVar("PN")
337 339
338 if mytaskname.endswith("_setscene"): 340 stagingdir = d.getVar("STAGING_DIR")
339 mytaskname = mytaskname.replace("_setscene", "") 341 sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests"
342 recipesysroot = d.getVar("RECIPE_SYSROOT")
343 recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
344 current_variant = d.getVar("BBEXTENDVARIANT")
345
346 # Detect bitbake -b usage
347 nodeps = d.getVar("BB_LIMITEDDEPS") or False
348 if nodeps:
349 lock = bb.utils.lockfile(recipesysroot + "/sysroot.lock")
350 staging_populate_sysroot_dir(recipesysroot, recipesysrootnative, True, d)
351 staging_populate_sysroot_dir(recipesysroot, recipesysrootnative, False, d)
352 bb.utils.unlockfile(lock)
353 return
340 354
341 start = None 355 start = None
342 configuredeps = [] 356 configuredeps = []
@@ -441,20 +455,6 @@ python extend_recipe_sysroot() {
441 455
442 bb.note("\n".join(msgbuf)) 456 bb.note("\n".join(msgbuf))
443 457
444 stagingdir = d.getVar("STAGING_DIR")
445 sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests"
446 recipesysroot = d.getVar("RECIPE_SYSROOT")
447 recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
448 current_variant = d.getVar("BBEXTENDVARIANT")
449
450 # Detect bitbake -b usage
451 nodeps = d.getVar("BB_LIMITEDDEPS") or False
452 if nodeps:
453 lock = bb.utils.lockfile(recipesysroot + "/sysroot.lock")
454 staging_populate_sysroot_dir(recipesysroot, recipesysrootnative, True, d)
455 staging_populate_sysroot_dir(recipesysroot, recipesysrootnative, False, d)
456 bb.utils.unlockfile(lock)
457
458 depdir = recipesysrootnative + "/installeddeps" 458 depdir = recipesysrootnative + "/installeddeps"
459 bb.utils.mkdirhier(depdir) 459 bb.utils.mkdirhier(depdir)
460 bb.utils.mkdirhier(sharedmanifests) 460 bb.utils.mkdirhier(sharedmanifests)