From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: master 20fa40d: Improve doc for web pages; reproducible tarballs Date: Sun, 1 Apr 2018 13:56:49 -0700 Organization: UCLA Computer Science Department Message-ID: <5be26af7-8a1d-37d2-9fc3-3039863f845d@cs.ucla.edu> References: <20180330231211.6450.29690@vcs0.savannah.gnu.org> <20180330231214.7A6F82041C@vcs0.savannah.gnu.org> <97lge817tj.fsf@fencepost.gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------8C253F85536C41721FA1424B" X-Trace: blaine.gmane.org 1522616104 13166 195.159.176.226 (1 Apr 2018 20:55:04 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 1 Apr 2018 20:55:04 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 01 22:55:00 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f2k0B-0003Ic-Kh for ged-emacs-devel@m.gmane.org; Sun, 01 Apr 2018 22:54:59 +0200 Original-Received: from localhost ([::1]:34568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f2k2F-0007Yf-90 for ged-emacs-devel@m.gmane.org; Sun, 01 Apr 2018 16:57:07 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f2k25-0007Xi-RW for emacs-devel@gnu.org; Sun, 01 Apr 2018 16:56:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f2k21-0005ax-Sg for emacs-devel@gnu.org; Sun, 01 Apr 2018 16:56:57 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:38562) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f2k21-0005aY-L9; Sun, 01 Apr 2018 16:56:53 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id B5E271616D0; Sun, 1 Apr 2018 13:56:51 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id jSY-DRdP0c8f; Sun, 1 Apr 2018 13:56:49 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 96D9F1616D1; Sun, 1 Apr 2018 13:56:49 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id N9Qmj1BWbpk9; Sun, 1 Apr 2018 13:56:49 -0700 (PDT) Original-Received: from [192.168.1.9] (unknown [47.154.30.119]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 75E031616D0; Sun, 1 Apr 2018 13:56:49 -0700 (PDT) In-Reply-To: <97lge817tj.fsf@fencepost.gnu.org> Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:224228 Archived-At: This is a multi-part message in MIME format. --------------8C253F85536C41721FA1424B Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Glenn Morris wrote: > This breaks make-dist on platforms where tar does not support --sort=name. Thanks for reporting that. I installed the attached, which I hope fixes it. --------------8C253F85536C41721FA1424B Content-Type: text/x-patch; name="0001-Port-make-dist-to-tar-1.27-and-earlier.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Port-make-dist-to-tar-1.27-and-earlier.patch" >From 69e3af0f6df4093c3e587261dbee64c3f749d47f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 1 Apr 2018 13:53:15 -0700 Subject: [PATCH] Port make-dist to tar 1.27 and earlier Problem reported by Glenn Morris in: https://lists.gnu.org/r/emacs-devel/2018-03/msg00984.html * make-dist: Use --sort=name only if Tar supports it. --- admin/make-tarball.txt | 3 ++- make-dist | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index bdf7b8c..f9ad217 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -210,7 +210,8 @@ longer present. Tar up the generated html_node/emacs/ and elisp/ directories and update the files manual/elisp.html_node.tar.gz and emacs.html_node.tar.gz. -Use GNU Tar as follows so that the tarballs are reproducible: +Use GNU Tar 1.28 or later so that the tarballs are more reproducible, +as follows: cd manual tar='tar --numeric-owner --owner=0 --group=0 --mode=go+u,go-w --sort=name' diff --git a/make-dist b/make-dist index 48c7fb4..d651e18 100755 --- a/make-dist +++ b/make-dist @@ -643,7 +643,9 @@ files= *) gzip_extension= ;; esac echo "Creating tar file" - taropt='--numeric-owner --owner=0 --group=0 --mode=go+u,go-w --sort=name' + taropt='--numeric-owner --owner=0 --group=0 --mode=go+u,go-w' + tar --sort=name -cf /dev/null $tempparent/$emacsname/src/lisp.h 2>/tmp/out && + taropt="$taropt --sort=name" [ "$verbose" = "yes" ] && taropt="$taropt --verbose" (cd ${tempparent} ; tar $taropt -cf - ${emacsname} ) \ -- 2.7.4 --------------8C253F85536C41721FA1424B--