[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
This commit is contained in:
parent
ba23e6286a
commit
c30c926f25
1 changed files with 1 additions and 1 deletions
|
@ -37,7 +37,7 @@ for i in ${patchdir}/${patchpattern} ; do
|
||||||
[ -d "${i}" ] && echo "Ignoring subdirectory ${i}" && continue
|
[ -d "${i}" ] && echo "Ignoring subdirectory ${i}" && continue
|
||||||
echo ""
|
echo ""
|
||||||
echo "Applying ${i} using ${type}: "
|
echo "Applying ${i} using ${type}: "
|
||||||
${uncomp} ${i} | patch -p1 -E -d ${targetdir}
|
${uncomp} ${i} | ${PATCH:-patch} -f -p1 -E -d ${targetdir}
|
||||||
if [ $? != 0 ] ; then
|
if [ $? != 0 ] ; then
|
||||||
echo "Patch failed! Please fix $i!"
|
echo "Patch failed! Please fix $i!"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue