diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-03 15:26:25 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-03 15:26:25 +0200 |
| commit | ea5982c66102e854157bea545d8eec79e00ed511 (patch) | |
| tree | 7d2d01a2d0d37e5a979e722975a7942d5d084a3f /scripts | |
| parent | 30de1b74c89a3b04176a93d5214aa5186f0a2a75 (diff) | |
| parent | 5f2187e92c8d151b840454282fe390ebad030e35 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/update-patches | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/scripts/update-patches b/scripts/update-patches index 3d5424ff0..bf0f134ac 100644 --- a/scripts/update-patches +++ b/scripts/update-patches @@ -82,9 +82,6 @@ fi if [[ -e $WRKDIST/../.autoreconf_done ]]; then touch "$ORGDIST/.autoreconf_done" - ignore_autoconf=1 -else - ignore_autoconf=0 fi DIFF_FLAGS="-adu -I \"^--- $(print -r -- "$D_SUBP.orig/" | $TRANSFORM)@@ .*\"" @@ -95,16 +92,9 @@ while IFS= read -p -d '' -r file; do file=${file#./} #print -r -- "DEBUG: <$file>" >>/tmp/debug [[ ! -e $ORGDIST/$file && $patch_newfiles = 0 ]] && continue - if (( ignore_autoconf )); then - [[ $file = configure ]] && continue - [[ $file = missing ]] && continue - [[ $file = depcomp ]] && continue - [[ $file = install-sh ]] && continue - [[ $file = aclocal.m4 ]] && continue - [[ $file = INSTALL ]] && continue - [[ $file = config.h.in ]] && continue - [[ ${file##*/} = Makefile.in ]] && continue - fi + for i in $DIFF_IGNOREFILES; do + [[ $file = $i ]] && continue + done cmp -s "$ORGDIST/$file" "$WRKDIST/$file" && continue print -ru2 -- "Processing ${file}..." # look in patchdir for an existing patchfile matching this |