summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-20 20:51:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-21 16:47:28 +0000
commit813a7600bc26b7132ac36d1515571d321f566afb (patch)
tree3d400aa5f22cecb94bccbc1d9b5575acf0bda6d2
parentc0c0af40ebddaf9dc99353c580a65d4c04295613 (diff)
downloadbitbake-contrib-813a7600bc26b7132ac36d1515571d321f566afb.tar.gz
bitbake-contrib-813a7600bc26b7132ac36d1515571d321f566afb.tar.bz2
bitbake-contrib-813a7600bc26b7132ac36d1515571d321f566afb.zip
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] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/runqueue.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 1e1bdf4b6e..25a2684001 100644
--- a/lib/bb/runqueue.py
+++ b/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