diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 456dbcca..7f12309c 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -98,6 +98,7 @@ function apply_patch { esac fi if [ -z "$silent" ] ; then + echo "" echo "Applying $patch using ${type}: " fi if [ ! -e "${path}/$patch" ] ; then @@ -112,17 +113,11 @@ function apply_patch { echo " to be applied : ${path}/${patch}" exit 1 fi - if ${uncomp} "${path}/$patch" | grep -q "^rename from" && \ - ${uncomp} "${path}/$patch" | grep -q "^rename to" ; then - 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 + echo "${path}/${patch}" >> ${builddir}/.applied_patches_list + ${uncomp} "${path}/$patch" | patch -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent if [ $? != 0 ] ; then echo "Patch failed! Please fix ${patch}!" exit 1 - else - echo "${path}/${patch}" >> ${builddir}/.applied_patches_list fi }