|
@ -98,6 +98,7 @@ function apply_patch { |
|
|
esac |
|
|
esac |
|
|
fi |
|
|
fi |
|
|
if [ -z "$silent" ] ; then |
|
|
if [ -z "$silent" ] ; then |
|
|
|
|
|
echo "" |
|
|
echo "Applying $patch using ${type}: " |
|
|
echo "Applying $patch using ${type}: " |
|
|
fi |
|
|
fi |
|
|
if [ ! -e "${path}/$patch" ] ; then |
|
|
if [ ! -e "${path}/$patch" ] ; then |
|
@ -112,17 +113,11 @@ function apply_patch { |
|
|
echo " to be applied : ${path}/${patch}" |
|
|
echo " to be applied : ${path}/${patch}" |
|
|
exit 1 |
|
|
exit 1 |
|
|
fi |
|
|
fi |
|
|
if ${uncomp} "${path}/$patch" | grep -q "^rename from" && \ |
|
|
echo "${path}/${patch}" >> ${builddir}/.applied_patches_list |
|
|
${uncomp} "${path}/$patch" | grep -q "^rename to" ; then |
|
|
${uncomp} "${path}/$patch" | patch -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent |
|
|
echo "Error: patch contains some renames, not supported by old patch versions" |
|
|
|
|
|
exit 1 |
|
|
|
|
|
fi |
|
|
|
|
|
${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 |
|
|
else |
|
|
|
|
|
echo "${path}/${patch}" >> ${builddir}/.applied_patches_list |
|
|
|
|
|
fi |
|
|
fi |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|