From 0f0f03b90bc3590679e12a67cc11f7eee796c3e6 Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Wed, 31 Oct 2018 21:46:54 -0500
Subject: [PATCH] Turn the log output volume down a notch or two

---
 releasetools/Targets.mk   | 10 +---------
 releasetools/Variables.mk |  3 +++
 releasetools/xslnons.mk   |  2 +-
 releasetools/xslns.mk     |  2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index b18f76a9e..0df2b8bf4 100644
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -39,7 +39,7 @@ ifeq ($(PDF_MAKER),dblatex)
 	&& $(DBLATEX) $(DBLATEX_FLAGS) \
 	  -p $(DBX_STYLE) \
 	  -o $@ \
-	  RELEASE-NOTES-STRIPPED-TMP.xml
+	  RELEASE-NOTES-STRIPPED-TMP.xml 2>&1 | $(TAIL)
 	$(RM) RELEASE-NOTES-STRIPPED-TMP.xml
 	$(RM) RELEASE-NOTES-TMP.xml
 endif
@@ -115,8 +115,6 @@ else
 # -----------------------------------------------------------------
 	rm -rf $(TMP)/docbook-$(DISTRO)-$(ZIPVER)
 	$(RM)  $(TMP)/tar.exclude
-	$(RM)  $(TMP)/docbook-$(DISTRO)-$(ZIPVER).tar.gz
-	$(RM)  $(TMP)/docbook-$(DISTRO)-$(ZIPVER).tar.bz2
 	$(RM)  $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip
 	umask 022; mkdir -p $(TMP)/docbook-$(DISTRO)-$(ZIPVER)
 	touch $(TMP)/tar.exclude
@@ -144,8 +142,6 @@ endif
 	fi
 # tar up distro, then gzip/bzip/zip it
 	-$(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) $(ZIPFLAGS) docbook-$(DISTRO)-$(ZIPVER).zip docbook-$(DISTRO)-$(ZIPVER)
 	$(RM) $(TMP)/tar.exclude
 
@@ -162,8 +158,6 @@ ifneq ($(DISTRIB_PACKAGES),)
           fi; \
 	  rm -rf $(TMP)/$$dirname; \
 	  $(RM)  $(TMP)/tar.exclude; \
-	  $(RM)  $(TMP)/$$package_name.tar.gz; \
-	  $(RM)  $(TMP)/$$package_name.tar.bz2; \
 	  $(RM)  $(TMP)/$$package_name.zip; \
 	  umask 022; mkdir -p $(TMP)/$$dirname; \
 	  touch $(TMP)/tar.exclude; \
@@ -180,8 +174,6 @@ ifneq ($(DISTRIB_PACKAGES),)
 	  if [ -d $$dirname/images ]; \
 	    then mv $$dirname/images $$dirname/doc/; \
 	  fi) ; \
-	  umask 022; (cd $(TMP) && $(TAR) cf$(TARFLAGS) - $$dirname | gzip > $$package_name.tar.gz); \
-	  umask 022; (cd $(TMP) && $(TAR) cf$(TARFLAGS) - $$dirname | bzip2 > $$package_name.tar.bz2); \
 	  umask 022; (cd $(TMP) && $(ZIP) $(ZIPFLAGS) $$package_name.zip $$dirname); \
 	  $(RM) $(TMP)/tar.exclude; \
 	done
diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index d23fa1e80..f2da23832 100644
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -239,3 +239,6 @@ SED_OPTS=
 
 GREP=egrep
 GREPFLAGS=
+
+TAIL=tail
+TAILFLAGS=
diff --git a/releasetools/xslnons.mk b/releasetools/xslnons.mk
index f15c2e068..a9365e27b 100755
--- a/releasetools/xslnons.mk
+++ b/releasetools/xslnons.mk
@@ -9,7 +9,7 @@ zip-nons: zip
 	$(RM)  $(TMP)/docbook-$(DISTRO)-nons-$(ZIPVER).tar.bz2
 	$(RM)  $(TMP)/docbook-$(DISTRO)-nons-$(ZIPVER).zip
 	(cd $(TMP) && \
-	  unzip $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip && \
+	  unzip -qq $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip && \
 	  $(repo_dir)/releasetools/xslnons-build \
 	  docbook-$(DISTRO)-$(ZIPVER) \
 	  docbook-$(DISTRO)-nons-$(ZIPVER)); 
diff --git a/releasetools/xslns.mk b/releasetools/xslns.mk
index 8494e92f7..5c15f6f97 100644
--- a/releasetools/xslns.mk
+++ b/releasetools/xslns.mk
@@ -9,7 +9,7 @@ zip-ns: zip
 	$(RM)  $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER).tar.bz2
 	$(RM)  $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER).zip
 	(cd $(TMP) && \
-	  unzip $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip && \
+	  unzip -qq $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip && \
 	  $(repo_dir)/releasetools/xslns-build \
 	  docbook-$(DISTRO)-$(ZIPVER) \
 	  docbook-$(DISTRO)-ns-$(ZIPVER)); 
-- 
2.40.0