sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: runqueue: Ensure pseudo executes from the correct place (use the right datastore with multiconfig) 

The location of the fakeroot command and the various environmental values need
to be taken from the right multiconfig datastore, not the shared one. This
patch ensures the right one is used for cases like a split TMPDIR.

[YOCTO #10344]

(Bitbake rev: 813a7600bc26b7132ac36d1515571d321f566afb)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2016-12-20 20:51:02 +00:00
parent d77a135e18
commit 5d620b7f90
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bitbake/lib/bb/runqueue.py
View File

@ -1004,8 +1004,9 @@ class RunQueue:
magic = "decafbadbad"
if fakeroot:
magic = magic + "beef"
fakerootcmd = self.cfgData.getVar("FAKEROOTCMD")
fakerootenv = (self.cfgData.getVar("FAKEROOTBASEENV") or "").split()
mcdata = self.cooker.databuilder.mcdata[mc]
fakerootcmd = mcdata.getVar("FAKEROOTCMD")
fakerootenv = (mcdata.getVar("FAKEROOTBASEENV") or "").split()
env = os.environ.copy()
for key, value in (var.split('=') for var in fakerootenv):
env[key] = value