[oe-commits] [bitbake] 01/07: runqueue: Ensure pseudo executes from the correct place (use the right datastore with multiconfig)

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 813a7600bc26b7132ac36d1515571d321f566afb
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Dec 20 20:51:02 2016 +0000

    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 at linuxfoundation.org>
---
 lib/bb/runqueue.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 1e1bdf4..25a2684 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.