diff options
Diffstat (limited to 'meta/classes/devshell.bbclass')
| -rw-r--r-- | meta/classes/devshell.bbclass | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass index a780118a12..92edb9ef25 100644 --- a/meta/classes/devshell.bbclass +++ b/meta/classes/devshell.bbclass @@ -3,6 +3,15 @@ inherit terminal DEVSHELL = "${SHELL}" python do_devshell () { + if d.getVarFlag("do_devshell", "manualfakeroot"): + d.prependVar("DEVSHELL", "pseudo ") + fakeenv = d.getVar("FAKEROOTENV", True).split() + for f in fakeenv: + k = f.split("=") + d.setVar(k[0], k[1]) + d.appendVar("OE_TERMINAL_EXPORTS", " " + k[0]) + d.delVarFlag("do_devshell", "fakeroot") + oe_terminal(d.getVar('DEVSHELL', True), 'OpenEmbedded Developer Shell', d) } @@ -17,11 +26,8 @@ do_devshell[nostamp] = "1" # manually python () { if d.getVarFlag("do_devshell", "fakeroot"): - d.prependVar("DEVSHELL", "pseudo ") - fakeenv = d.getVar("FAKEROOTENV", True).split() - for f in fakeenv: - k = f.split("=") - d.setVar(k[0], k[1]) - d.appendVar("OE_TERMINAL_EXPORTS", " " + k[0]) + # We need to signal our code that we want fakeroot however we + # can't manipulate the environment and variables here yet (see YOCTO #4795) + d.setVarFlag("do_devshell", "manualfakeroot", "1") d.delVarFlag("do_devshell", "fakeroot") } |