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-22 12:36:40 +0000
commit5d620b7f90a6d43967b271bc165d23239b25d61c (patch)
treebc873feb4cbcb2df670d16efc0a55dcecfd07e33
parentd77a135e18365369f7823088fa46df680b3a201e (diff)
downloadpoky-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.py5
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:
1004 magic = "decafbadbad" 1004 magic = "decafbadbad"
1005 if fakeroot: 1005 if fakeroot:
1006 magic = magic + "beef" 1006 magic = magic + "beef"
1007 fakerootcmd = self.cfgData.getVar("FAKEROOTCMD") 1007 mcdata = self.cooker.databuilder.mcdata[mc]
1008 fakerootenv = (self.cfgData.getVar("FAKEROOTBASEENV") or "").split() 1008 fakerootcmd = mcdata.getVar("FAKEROOTCMD")
1009 fakerootenv = (mcdata.getVar("FAKEROOTBASEENV") or "").split()
1009 env = os.environ.copy() 1010 env = os.environ.copy()
1010 for key, value in (var.split('=') for var in fakerootenv): 1011 for key, value in (var.split('=') for var in fakerootenv):
1011 env[key] = value 1012 env[key] = value