diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
| commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
| tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /scripts/update-patches | |
| parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
| parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts/update-patches')
| -rw-r--r-- | scripts/update-patches | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/scripts/update-patches b/scripts/update-patches index d38a8fdf4..f4303f841 100644 --- a/scripts/update-patches +++ b/scripts/update-patches @@ -77,11 +77,27 @@ else patch_newfiles=0 fi +if [[ -e $WRKDIST/../.autoreconf_done ]]; then + touch $ORGDIST/.autoreconf_done + ignore_autoconf=1 +else + ignore_autoconf=0 +fi + DIFF_FLAGS="-adu -I \"^--- $(echo $D_SUBP.orig/ | $TRANSFORM)@@ .*\"" DIFF_FLAGS="$DIFF_FLAGS -I \"^\+\+\+ $(echo $D_SUBP/ | $TRANSFORM)@@ .*\"" for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do + echo "DEBUG: $file" >> /tmp/debug [[ ! -e $ORGDIST/$file && $patch_newfiles = 0 ]] && continue + [[ $file = configure && $ignore_autoconf = 1 ]] && continue + [[ $file = missing && $ignore_autoconf = 1 ]] && continue + [[ $file = depcomp && $ignore_autoconf = 1 ]] && continue + [[ $file = install-sh && $ignore_autoconf = 1 ]] && continue + [[ $file = aclocal.m4 && $ignore_autoconf = 1 ]] && continue + [[ $file = INSTALL && $ignore_autoconf = 1 ]] && continue + [[ $file = config.h.in && $ignore_autoconf = 1 ]] && continue + [[ $(basename $file) = Makefile.in && $ignore_autoconf = 1 ]] && continue cmp -s "$ORGDIST/$file" "$WRKDIST/$file" && continue echo "Processing ${file}..." >&2 # look in patchdir for an existing patchfile matching this |