diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-20 20:51:02 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-22 12:36:40 +0000 |
| commit | 5d620b7f90a6d43967b271bc165d23239b25d61c (patch) | |
| tree | bc873feb4cbcb2df670d16efc0a55dcecfd07e33 | |
| parent | d77a135e18365369f7823088fa46df680b3a201e (diff) | |
| download | openembedded-core-contrib-5d620b7f90a6d43967b271bc165d23239b25d61c.tar.gz | |
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>
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 1e1bdf4b6e..25a2684001 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -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 |