lib/oe/patch.py: Fix patch application failure interaction handling

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index ad1afad30dc5dde5bbc02b2c656322b890faf017..9d8e59457c59d83e38e612a834579923e502167d 100644 (file)
--- 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 c1d616e66829cf81e447a379b33e508ac1bff627..94c56bc101f91fd480e215412573e2e6010f86e4 100644 (file)
--- 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. " \