From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 8 Oct 2010 09:21:01 +0000 (+0000)
Subject: patch-kernel.sh: utilize --force (#7745), also use the PATCH env var and fallback... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=be2a1e14babe42c1767780b1dc6ada97b8a7ca84;p=openwrt%2Fstaging%2Fnbd.git

patch-kernel.sh: utilize --force (#7745), also use the PATCH env var and fallback to "patch" if unset

SVN-Revision: 23314
---

diff --git a/scripts/patch-kernel.sh b/scripts/patch-kernel.sh
index 5455a0cf8d..91753ba2fd 100755
--- a/scripts/patch-kernel.sh
+++ b/scripts/patch-kernel.sh
@@ -37,7 +37,7 @@ for i in ${patchdir}/${patchpattern} ; do
     [ -d "${i}" ] && echo "Ignoring subdirectory ${i}" && continue	
     echo ""
     echo "Applying ${i} using ${type}: " 
-    ${uncomp} ${i} | patch -p1 -E -d ${targetdir} 
+    ${uncomp} ${i} | ${PATCH:-patch} -f -p1 -E -d ${targetdir} 
     if [ $? != 0 ] ; then
         echo "Patch failed!  Please fix $i!"
 	exit 1