]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
apply-patches: run patch in batch mode
authorArnout Vandecappelle <arnout@mind.be>
Thu, 22 Aug 2013 18:02:13 +0000 (20:02 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Tue, 27 Aug 2013 20:28:32 +0000 (22:28 +0200)
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>
support/scripts/apply-patches.sh

index 2995ea9972da0a71fde23fa5b3281ea6bdb188f7..e9c68695db04db6cbe1136bc36479b88e650e25a 100755 (executable)
@@ -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