From: W.C.A. Wijngaards Date: Tue, 30 Nov 2021 12:38:39 +0000 (+0100) Subject: - Fix to remove git tracking and ci information from release tarballs. X-Git-Tag: release-1.14.0rc1~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cee189e536d9da0fc07c027b00a4a9578692b2f;p=thirdparty%2Funbound.git - Fix to remove git tracking and ci information from release tarballs. --- diff --git a/doc/Changelog b/doc/Changelog index aa21d3515..2634c6828 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +30 November 2021: Wouter + - Fix to remove git tracking and ci information from release tarballs. + 29 November 2021: Wouter - Merge PR #570 from rex4539: Fix typos. - Fix for #570: regen aclocal.m4, fix configure.ac for spelling. diff --git a/makedist.sh b/makedist.sh index ea79e7b46..4234a0672 100755 --- a/makedist.sh +++ b/makedist.sh @@ -329,7 +329,7 @@ if [ "$DOWIN" = "yes" ]; then info "git clone --depth=1 --no-tags -b $GITBRANCH $GITREPO unbound" git clone --depth=1 --no-tags -b $GITBRANCH $GITREPO unbound || error_cleanup "git clone failed" cd unbound || error_cleanup "Unbound not exported correctly from git" - rm -rf .git || error_cleanup "Failed to remove .git tracking information" + rm -rf .git .travis.yml .gitattributes .github .gitignore || error_cleanup "Failed to remove .git tracking and ci information" # on a re-configure the cache may no longer be valid... if test -f mingw32-config.cache; then rm mingw32-config.cache; fi @@ -489,7 +489,7 @@ info "git clone --depth=1 --no-tags -b $GITBRANCH $GITREPO unbound" git clone --depth=1 --no-tags -b $GITBRANCH $GITREPO unbound || error_cleanup "git clone failed" cd unbound || error_cleanup "Unbound not exported correctly from git" -rm -rf .git || error_cleanup "Failed to remove .git tracking information" +rm -rf .git .travis.yml .gitattributes .github .gitignore || error_cleanup "Failed to remove .git tracking and ci information" info "Adding libtool utils (libtoolize)." libtoolize -c --install || libtoolize -c || error_cleanup "Libtoolize failed."