Made adjustments to deal with relatively recent changes that have

apparently been made in GNU tar: (1) rearranged args into an order
acceptable to the new tar, and (2) added the "P" switch to stop it
from complaining about about the absolute path name specified for
the tar.exclude file.

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 890775ae1a7a1cd2e70a6bec94a774598bbd42b3..72df0a60e6d3ba77f4fe8aa546b4751fb3087da3 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -121,9 +121,9 @@ ifneq ($(DISTRIB_PACKAGES),)
        done
 endif
 # tar up distro, then gzip/bzip/zip it
-       tar cf - * .[^.]* --exclude-from $(TMP)/tar.exclude | (cd $(TMP)/docbook-$(DISTRO)-$(ZIPVER); tar xf -)
-       umask 022; cd $(TMP) && tar cf - docbook-$(DISTRO)-$(ZIPVER) | gzip > docbook-$(DISTRO)-$(ZIPVER).tar.gz
-       umask 022; cd $(TMP) && tar cf - docbook-$(DISTRO)-$(ZIPVER) | bzip2 > docbook-$(DISTRO)-$(ZIPVER).tar.bz2
+       $(TAR) cf$(TARFLAGS) - -X $(TMP)/tar.exclude * .[^.]* | (cd $(TMP)/docbook-$(DISTRO)-$(ZIPVER); $(TAR) xf$(TARFLAGS) -)
+       umask 022; cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | gzip > docbook-$(DISTRO)-$(ZIPVER).tar.gz
+       umask 022; cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | bzip2 > docbook-$(DISTRO)-$(ZIPVER).tar.bz2
        umask 022; cd $(TMP) && zip -q -rpD docbook-$(DISTRO)-$(ZIPVER).zip docbook-$(DISTRO)-$(ZIPVER)
        rm -f $(TMP)/tar.exclude
 
@@ -147,13 +147,13 @@ ifneq ($(DISTRIB_PACKAGES),)
        for file in $(ZIP_EXCLUDES); do \
          find . -print  | grep $$file   | cut -c3- >> $(TMP)/tar.exclude; \
        done; \
-       tar cf - --ignore-failed-read $$part $${part}src images --exclude-from $(TMP)/tar.exclude | (cd $(TMP)/docbook-$(DISTRO)-$(ZIPVER); tar xf -); \
+       $(TAR) cf$(TARFLAGS) - -X $(TMP)/tar.exclude --ignore-failed-read $$part $${part}src images | (cd $(TMP)/docbook-$(DISTRO)-$(ZIPVER); $(TAR) xf$(TARFLAGS) -); \
        umask 022; (cd $(TMP) && \
        if [ -d docbook-$(DISTRO)-$(ZIPVER)/images ]; \
          then mv docbook-$(DISTRO)-$(ZIPVER)/images docbook-$(DISTRO)-$(ZIPVER)/doc/; \
        fi) ; \
-       umask 022; (cd $(TMP) && tar cf - docbook-$(DISTRO)-$(ZIPVER) | gzip > docbook-$(DISTRO)-$$part-$(ZIPVER).tar.gz); \
-       umask 022; (cd $(TMP) && tar cf - docbook-$(DISTRO)-$(ZIPVER) | bzip2 > docbook-$(DISTRO)-$$part-$(ZIPVER).tar.bz2); \
+       umask 022; (cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | gzip > docbook-$(DISTRO)-$$part-$(ZIPVER).tar.gz); \
+       umask 022; (cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | bzip2 > docbook-$(DISTRO)-$$part-$(ZIPVER).tar.bz2); \
        umask 022; (cd $(TMP) && zip -q -rpD docbook-$(DISTRO)-$$part-$(ZIPVER).zip docbook-$(DISTRO)-$(ZIPVER)); \
        rm -f $(TMP)/tar.exclude; \
        done
@@ -170,8 +170,8 @@ install: zip
           umask 002; \
           cd $(RELEASE_DIR)/$(DISTRO); \
           rm -rf $(ZIPVER); \
-          tar xfj docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \
-          tar xfj docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2; \
+          $(TAR) xfj$(TARFLAGS) docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \
+          $(TAR) xfj$(TARFLAGS) docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2; \
           mv docbook-$(DISTRO)-$(ZIPVER) $(ZIPVER); \
           rm -rf docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \
           rm -rf docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2; \

diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index ffde3ae8b34a32864a11c189f29393ed9ff3417d..7ca1dfa331922f955e00d1032209cadc83eff463 100644 (file)
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -121,3 +121,5 @@ SF_UPLOAD_DIR=incoming
 PROJECT_HOST=docbook.sf.net
 RELEASE_DIR=/home/groups/d/do/docbook/htdocs/release
 PROJECT_USER:=`sed 's/^:.\+:\([^@]\+\)@.\+$$/\1/' CVS/Root`
+TAR=tar
+TARFLAGS=P