diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/bitbake.conf | 3 | ||||
-rw-r--r-- | meta/lib/oe/patch.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index ad1afad30d..9d8e59457c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -521,8 +521,7 @@ SRC_URI = "file://${FILE}" | |||
521 | # UI/Interaction Configuration | 521 | # UI/Interaction Configuration |
522 | ################################################################## | 522 | ################################################################## |
523 | 523 | ||
524 | SHELLRCCMD = "bash --rcfile $TERMRCFILE" | 524 | export SHELLCMDS = "bash" |
525 | export SHELLCMDS = "${SHELLRCCMD}" | ||
526 | # Some common terminal programs to choose from | 525 | # Some common terminal programs to choose from |
527 | GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"' | 526 | GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"' |
528 | GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS' | 527 | GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS' |
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index c1d616e668..94c56bc101 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
@@ -373,7 +373,7 @@ class UserResolver(Resolver): | |||
373 | os.chmod(rcfile, 0775) | 373 | os.chmod(rcfile, 0775) |
374 | 374 | ||
375 | os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually" | 375 | os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually" |
376 | os.environ['TERMRCFILE'] = rcfile | 376 | os.environ['SHELLCMDS'] = "bash --rcfile " + rcfile |
377 | rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1)) | 377 | rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1)) |
378 | if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0: | 378 | if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0: |
379 | bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \ | 379 | bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \ |