patch-kernel.sh: utilize --force (#7745), also use the PATCH env var and fallback to "patch" if unset
SVN-Revision: 23314
This commit is contained in:
parent
226abf88f5
commit
be2a1e14ba
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…
Reference in a new issue