[tools] mm-macros: update to 0.9.5

[openwrt.git] / scripts / patch-kernel.sh

diff --git a/scripts/patch-kernel.sh b/scripts/patch-kernel.sh
index 79401c2..91753ba 100755 (executable)
--- a/scripts/patch-kernel.sh
+++ b/scripts/patch-kernel.sh
@@ -34,9 +34,10 @@ for i in ${patchdir}/${patchpattern} ; do
        *)
        type="plaintext"; uncomp="cat"; ;; 
     esac
        *)
        type="plaintext"; uncomp="cat"; ;; 
     esac

+    [ -d "${i}" ] && echo "Ignoring subdirectory ${i}" && continue     

     echo ""
     echo "Applying ${i} using ${type}: " 
     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
     if [ $? != 0 ] ; then
         echo "Patch failed!  Please fix $i!"
        exit 1