Carlo Marcelo Arenas Belón <carenas@xxxxxxxxx> writes: > On Tue, Sep 08, 2020 at 05:09:35PM -0700, Junio C Hamano wrote: >> >> I'm contemplating to apply something like the following patch to the >> build procedure so that I can externally control the mode bits >> recorded in the tarball by setting TAR_C_EXTRA_OPTS to options that >> overrides mode bits and stuff (it takes GNU tar unfortunately, but >> I suspect I am the only person that runs dist-doc target anyway) > > also useful (albeit not for the same reason) with BSD tar for adding > things like "--check-links", either way don't forget the signed-off > while adding: > > Tested-by: Carlo Marcelo Arenas Belón <carenas@xxxxxxxxx> I just realized that we should do the same for the soure release tarball, not just preformatted documentation tarballs that are not really sources. The use of the 'c' mode with 'tar' is an implementation detail of doing a 'distribution'; TAR_C_EXTRA_OPTS in the draft version was renamed to TAR_DIST_EXTRA_OPTS to make it more clear that this is for use with $(TAR) for dist targets. Thanks. -- >8 -- From: Junio C Hamano <gitster@xxxxxxxxx> Date: Wed, 9 Sep 2020 11:53:04 -0700 Subject: [PATCH] Makefile: allow extra tweaking of distribution tarball The maintainer's dist rules are used to produce distribution tarballs. They use "$(TAR) cf" and "$(TAR) rf" to produce archives out of a freshly created local installation area, which means that the built product can be affected by maintainer's umask and other local environment. Implementations of "tar" have ways (implementation specific, unfortunately) to force permission bits and other stuff to allow the user to hide these effects coming from the local environment. Teach our Makefile to allow the maintainer to tweak the invocation of the $(TAR) commands by setting TAR_DIST_EXTRA_OPTS. Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 86e5411f39..62e8bfcf6e 100644 --- a/Makefile +++ b/Makefile @@ -2992,6 +2992,9 @@ quick-install-html: ### Maintainer's dist rules +# Allow tweaking to hide local environment effects, like perm bits. +# With GNU tar, "--mode=u+rwX,og+rX,og-w" would be a good idea, for example. +TAR_DIST_EXTRA_OPTS = GIT_TARNAME = git-$(GIT_VERSION) dist: git-archive$(X) configure ./git-archive --format=tar \ @@ -3000,7 +3003,7 @@ dist: git-archive$(X) configure @cp configure $(GIT_TARNAME) @echo $(GIT_VERSION) > $(GIT_TARNAME)/version @$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version - $(TAR) rf $(GIT_TARNAME).tar \ + $(TAR) rf $(GIT_TARNAME).tar $(TAR_DIST_EXTRA_OPTS) \ $(GIT_TARNAME)/configure \ $(GIT_TARNAME)/version \ $(GIT_TARNAME)/git-gui/version @@ -3014,7 +3017,7 @@ ifdef DC_SHA1_SUBMODULE $(GIT_TARNAME)/sha1collisiondetection/lib/ @cp sha1collisiondetection/lib/ubc_check.[ch] \ $(GIT_TARNAME)/sha1collisiondetection/lib/ - $(TAR) rf $(GIT_TARNAME).tar \ + $(TAR) rf $(GIT_TARNAME).tar $(TAR_DIST_EXTRA_OPTS) \ $(GIT_TARNAME)/sha1collisiondetection/LICENSE.txt \ $(GIT_TARNAME)/sha1collisiondetection/lib/sha1.[ch] \ $(GIT_TARNAME)/sha1collisiondetection/lib/ubc_check.[ch] @@ -3048,7 +3051,7 @@ dist-doc: $(RM) -r .doc-tmp-dir mkdir .doc-tmp-dir $(MAKE) -C Documentation WEBDOC_DEST=../.doc-tmp-dir install-webdoc - cd .doc-tmp-dir && $(TAR) cf ../$(htmldocs).tar . + cd .doc-tmp-dir && $(TAR) cf ../$(htmldocs).tar $(TAR_DIST_EXTRA_OPTS) . gzip -n -9 -f $(htmldocs).tar : $(RM) -r .doc-tmp-dir @@ -3058,7 +3061,7 @@ dist-doc: man5dir=../.doc-tmp-dir/man5 \ man7dir=../.doc-tmp-dir/man7 \ install - cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar . + cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar $(TAR_DIST_EXTRA_OPTS) . gzip -n -9 -f $(manpages).tar $(RM) -r .doc-tmp-dir -- 2.28.0-558-g7a0184fd7b
