summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnout Vandecappelle <arnout@mind.be>2013-08-22 18:02:13 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-08-27 20:28:32 (GMT)
commit5871b791995ebe295db7dca608afe3f293ce8953 (patch)
tree65e4f0c0aea66c738ea6c90ed7f056db755ba665
parentf627ebeb79930e00b25eb376554ff2b68cd077c5 (diff)
downloadbuildroot-5871b791995ebe295db7dca608afe3f293ce8953.tar.gz
buildroot-5871b791995ebe295db7dca608afe3f293ce8953.tar.bz2
apply-patches: run patch in batch mode
If the file to be patched is missing, then `patch' will interactively ask for a file to be patched. This is annoying in e.g. the autobuilders because they have to wait for a timeout instead of failing. Giving the '-t' (batch mode) option to patch fixes this: it will skip the missing file, and return a non-zero exit code. So the build cleanly fails. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rwxr-xr-xsupport/scripts/apply-patches.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 2995ea9..e9c6869 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -80,7 +80,7 @@ function apply_patch {
echo ""
echo "Applying $patch using ${type}: "
echo $patch >> ${builddir}/.applied_patches_list
- ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}"
+ ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t
if [ $? != 0 ] ; then
echo "Patch failed! Please fix ${patch}!"
exit 1