summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/lib/oe/patch.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index ad1afad30..9d8e59457 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -521,8 +521,7 @@ SRC_URI = "file://${FILE}"
# UI/Interaction Configuration
##################################################################
-SHELLRCCMD = "bash --rcfile $TERMRCFILE"
-export SHELLCMDS = "${SHELLRCCMD}"
+export SHELLCMDS = "bash"
# Some common terminal programs to choose from
GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"'
GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS'
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index c1d616e66..94c56bc10 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -373,7 +373,7 @@ class UserResolver(Resolver):
os.chmod(rcfile, 0775)
os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually"
- os.environ['TERMRCFILE'] = rcfile
+ os.environ['SHELLCMDS'] = "bash --rcfile " + rcfile
rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0:
bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \