Parcourir la source

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

SVN-Revision: 23314
Jo-Philipp Wich il y a 15 ans
Parent
commit
be2a1e14ba
1 fichiers modifiés avec 1 ajouts et 1 suppressions
  1. 1 1
      scripts/patch-kernel.sh

+ 1 - 1
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