mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2010-06-10 20:22:41 +01:00
parent 453ee8d573
commit beef002bb4
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/conf/bitbake.conf
+1 -2
View File
@@ -521,8 +521,7 @@ SRC_URI = "file://${FILE}"
# UI/Interaction Configuration # UI/Interaction Configuration
################################################################## ##################################################################
SHELLRCCMD = "bash --rcfile $TERMRCFILE" export SHELLCMDS = "bash"
export SHELLCMDS = "${SHELLRCCMD}"
# Some common terminal programs to choose from # Some common terminal programs to choose from
GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"' GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"'
GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS' GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS'
meta/lib/oe/patch.py
+1 -1
View File
@@ -373,7 +373,7 @@ class UserResolver(Resolver):
os.chmod(rcfile, 0775) os.chmod(rcfile, 0775)
os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually" 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)) rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0: 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. " \ bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \