From be2a1e14babe42c1767780b1dc6ada97b8a7ca84 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 8 Oct 2010 09:21:01 +0000 Subject: [PATCH] patch-kernel.sh: utilize --force (#7745), also use the PATCH env var and fallback to "patch" if unset SVN-Revision: 23314 --- scripts/patch-kernel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/patch-kernel.sh b/scripts/patch-kernel.sh index 5455a0cf8d53..91753ba2fdf1 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 -- 2.30.2