[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3887/8267] bitbake: runqueue: Ensure pseudo executes from the correct place (use the right datastore with multi

[Emmanuele Bassi <ebassi src gnome org>]

commit 5d620b7f90a6d43967b271bc165d23239b25d61c
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Tue Dec 20 20:51:02 2016 +0000

    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>

 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 1e1bdf4..25a2684 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