diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-08 09:21:01 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-08 09:21:01 +0000 |
| commit | c30c926f2524c7d40e59ad630e510c69015f105f (patch) | |
| tree | b8f2eefe6ea668b49e3d0617d8d28353e721298a | |
| parent | ba23e6286a6780fc0a5763e9d45b0b64afae447b (diff) | |
[scripts] patch-kernel.sh: utilize --force (#7745), also use the PATCH env var and fallback to "patch" if unset
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23314 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | scripts/patch-kernel.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/patch-kernel.sh b/scripts/patch-kernel.sh index 5455a0cf8..91753ba2f 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 |