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 | 1115bcc62c78c2bc78bcec364b2c3c3f8221fbfc (patch) | |
| tree | b8f2eefe6ea668b49e3d0617d8d28353e721298a /scripts/patch-kernel.sh | |
| parent | c3154eb0faa3116d8d0766a62a891fb6ac95b0d3 (diff) | |
| download | master-187ad058-1115bcc62c78c2bc78bcec364b2c3c3f8221fbfc.tar.gz master-187ad058-1115bcc62c78c2bc78bcec364b2c3c3f8221fbfc.tar.bz2 master-187ad058-1115bcc62c78c2bc78bcec364b2c3c3f8221fbfc.zip | |
[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
Diffstat (limited to 'scripts/patch-kernel.sh')
| -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 |