diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-10-08 09:21:01 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-10-08 09:21:01 +0000 |
| commit | be2a1e14babe42c1767780b1dc6ada97b8a7ca84 (patch) | |
| tree | 8679664a127d454249d52c8e96914cad11bb7c98 /scripts | |
| parent | 226abf88f5e130adc8409bb8253d25ccefc499a8 (diff) | |
| download | master-31e0f0ae-be2a1e14babe42c1767780b1dc6ada97b8a7ca84.tar.gz master-31e0f0ae-be2a1e14babe42c1767780b1dc6ada97b8a7ca84.tar.bz2 master-31e0f0ae-be2a1e14babe42c1767780b1dc6ada97b8a7ca84.zip | |
patch-kernel.sh: utilize --force (#7745), also use the PATCH env var and fallback to "patch" if unset
SVN-Revision: 23314
Diffstat (limited to 'scripts')
| -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 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 |