|
@@ -119,7 +119,7 @@ function apply_patch {
|
|
exit 1
|
|
exit 1
|
|
fi
|
|
fi
|
|
echo "${path}/${patch}" >> ${builddir}/.applied_patches_list
|
|
echo "${path}/${patch}" >> ${builddir}/.applied_patches_list
|
|
- ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t -N $silent
|
|
|
|
|
|
+ ${uncomp} "${path}/$patch" | patch -g0 -p1 -E --no-backup-if-mismatch -d "${builddir}" -t -N $silent
|
|
if [ $? != 0 ] ; then
|
|
if [ $? != 0 ] ; then
|
|
echo "Patch failed! Please fix ${patch}!"
|
|
echo "Patch failed! Please fix ${patch}!"
|
|
exit 1
|
|
exit 1
|
|
@@ -168,6 +168,3 @@ if [ "`find $builddir/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] ; then
|
|
echo "Aborting. Reject files found."
|
|
echo "Aborting. Reject files found."
|
|
exit 1
|
|
exit 1
|
|
fi
|
|
fi
|
|
-
|
|
|
|
-# Remove backup files
|
|
|
|
-find $builddir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \;
|
|
|