Received: (at 70380) by debbugs.gnu.org; 18 Apr 2024 18:51:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Apr 18 14:51:27 2024
Received: from localhost ([127.0.0.1]:54027 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rxWr0-0000yB-S0
for submit <at> debbugs.gnu.org; Thu, 18 Apr 2024 14:51:27 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:37830)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rxWqz-0000y5-B4
for 70380 <at> debbugs.gnu.org; Thu, 18 Apr 2024 14:51:26 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rxWqb-0001Bj-6g; Thu, 18 Apr 2024 14:51:05 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=lBGqT2G1b7daoFzxVmICKQfKdO3fveM3j0vltFyZqz8=; b=P1WrJwm1lz51KOCxnB2x
wUVEdLOJA1JjS11EnQ4g2Aswhxxw7AT/t6EJ3TwlEO12mVvh0DAod6p+Pq+mneoi96JU/LDrFg2s6
7NfsHeE5z9v103RU+HOh8L0ueozj/7T2IUY/0+b12T/RFf+TdhmXELWNXIb8h2yLa5f5+b+FtkeeP
MGczy5OlJlQ6BFqXAfZ2URGQsq4+2XNnaa3pLGj31YcvEvjRfK2URYRSeo6IJjdqO8Z44EZ49BYJg
HGaE10NSfako5xXLJvE7hIrFe/DMxtyy1EH3hlmwn9c09uU2MMGQkitVjAriNWjLnBnMfmV05AXyY
NM2fdD3S/XaFVA==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN>
Subject: Re: [bug#70380] [PATCH v4 2/6] maint: Support `make doc-po-update'
from tarball.
In-Reply-To: <877cguubgd.fsf@HIDDEN> (pelzflorian@HIDDEN's
message of "Thu, 18 Apr 2024 14:01:06 +0200")
Organization: AvatarAcademy.nl
References: <cover.1713379858.git.janneke@HIDDEN>
<8c9f63715e8d7613c4a23fcccf828ccb5b323dae.1713379858.git.janneke@HIDDEN>
<877cguubgd.fsf@HIDDEN>
X-Url: http://AvatarAcademy.nl
Date: Thu, 18 Apr 2024 20:50:09 +0200
Message-ID: <87le5asdy6.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
Cc: 70380 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
pelzflorian (Florian Pelz) writes:
Hi Florian,
> Hi Jan. There is a typo in the 2/6 top commit message, where `make
> doc-po-update' must be `make doc-pot-update' with a t.
Thanks, fixed.
> Which I believe is also what you meant when in your non-patch V4 0/6
> response, you spoke of update-po.
In V4 0/6 I was thinking about make -C po/{guix,packages} update-po,
but yeah. Same difference I guess ;)
> Also yet one more problem (perhaps) I=E2=80=99ve discovered that =E2=80=
=9Cinfo
> doc/guix.info=E2=80=9D now says:
>
> This document describes GNU Guix version , a functional package
[..]
> Could you fix this, too? Or do I make a mistake and would a real
> release display properly?
If you can help me reproduce this problem, sure. I tried several things
but haven't been able to reproduce it yet. Every time I get
--8<---------------cut here---------------start------------->8---
This document describes GNU Guix version 1.3.0.58022-1d8520, a
functional package management tool written for the GNU system.
--8<---------------cut here---------------end--------------->8---
What recipe did you use? I'm probably doing the same thing to test and
might well be missing something.
> Otherwise, all LGTM now and again, thank you!
Yay!
Greetings,
Janneke
--=20
Janneke Nieuwenhuizen <janneke@HIDDEN> | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade=
my.com
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.Received: (at 70380) by debbugs.gnu.org; 18 Apr 2024 12:01:43 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Apr 18 08:01:42 2024 Received: from localhost ([127.0.0.1]:52022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rxQSO-0004Cr-Us for submit <at> debbugs.gnu.org; Thu, 18 Apr 2024 08:01:41 -0400 Received: from relay.yourmailgateway.de ([188.68.63.102]:43033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pelzflorian@HIDDEN>) id 1rxQSG-0004C7-L5 for 70380 <at> debbugs.gnu.org; Thu, 18 Apr 2024 08:01:33 -0400 Received: from mors-relay-2502.netcup.net (localhost [127.0.0.1]) by mors-relay-2502.netcup.net (Postfix) with ESMTPS id 4VKxFP6ktfz63JC; Thu, 18 Apr 2024 14:01:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1713441673; bh=Wsf1sa43vxWdzo7XZIwK4YJnDyLMXyh1enVB2N5IawY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=BxJgZmE5wJdX2iVxEnO1p95cNZ7BZWekivHwSkMnBx0DojFpQGQYuh2MAI8OB8P0C H7FX2HDMlDWkz053XTpawid6qM1N44MoQhQpd2SjzNE3C/mRs9uILKZVE9QrJpYTQn BXHx9ERcxUVTK3Y/DlsqoFS1SaYp1b1g3eshNXuCyCjt8I6JtM4iLk65eLI5+qSwX0 ZsEPZ2vOmKb+9tKU92vu1/zxib2ex7kk3iGjt+AA/mCUNTdgfWnEpkmL1/TMRbYM/p DtRg39dvjNPhMWYJir+jhjnv8NPnhmfyfOWQ87BwfDPDQIwhcay9HLhQiUO24vF4NQ cozPmpi2hT67A== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-2502.netcup.net (Postfix) with ESMTPS id 4VKxFP60Rgz4yZj; Thu, 18 Apr 2024 14:01:13 +0200 (CEST) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4VKxFP3RQZz8sgw; Thu, 18 Apr 2024 14:01:13 +0200 (CEST) Received: from florianrock64 (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id 0E35D839E3; Thu, 18 Apr 2024 14:01:07 +0200 (CEST) From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: [bug#70380] [PATCH v4 2/6] maint: Support `make doc-po-update' from tarball. In-Reply-To: <8c9f63715e8d7613c4a23fcccf828ccb5b323dae.1713379858.git.janneke@HIDDEN> (Janneke Nieuwenhuizen's message of "Wed, 17 Apr 2024 21:08:46 +0200") References: <cover.1713379858.git.janneke@HIDDEN> <8c9f63715e8d7613c4a23fcccf828ccb5b323dae.1713379858.git.janneke@HIDDEN> Date: Thu, 18 Apr 2024 14:01:06 +0200 Message-ID: <877cguubgd.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 0E35D839E3 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: fbjQ2igugKedh0p5lso++k97iv5A6brkYrilN1XoqzD492+v80QfchtY X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70380 Cc: 70380 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Jan. There is a typo in the 2/6 top commit message, where `make doc-po-update' must be `make doc-pot-update' with a t. Which I believe is also what you meant when in your non-patch V4 0/6 response, you spoke of update-po. Also yet one more problem (perhaps) I=E2=80=99ve discovered that =E2=80=9Ci= nfo doc/guix.info=E2=80=9D now says: This document describes GNU Guix version , a functional package The version number is missing, but the official 1.4.0 tarball=E2=80=99s doc/guix.info says: This document describes GNU Guix version 1.4.0, a functional package Could you fix this, too? Or do I make a mistake and would a real release display properly? Otherwise, all LGTM now and again, thank you! Regards, Florian
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 19:09:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 15:09:37 2024
Received: from localhost ([127.0.0.1]:47616 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rxAf3-0000WX-F7
for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:37 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:37124)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rxAen-0000T1-1i
for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:22 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rxAeU-0003Cx-N7; Wed, 17 Apr 2024 15:09:02 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=/IgthRV+DK3fnFHAK0ShArj105AC7+Zsb6GJNQqs/Q0=; b=N/XfG/GfLmAsKpaGElwk
v1yXFy0MYXx9eHAc0o6WyIx6aJnbczMYwNAjQs6BMkMb5LDtK6LvWOi1bLGOPfM+AybkfggKGCNuu
YN2AfZopC+dVLUeB7ZTII0OjrSOHRPZn8q+hCTwuNFOjJ+LJKbJrzM9aICFHySFmPPsMuLVypSJA4
X0Q6G37Q3Uw3FQXQmKVpBbSyqLZMqgOX0V0MQwqYkzQLo/U9S5u096V4cKpf2ZlWnBZAN4DId/sty
9xkSQZQ8QDIV+l79aFRShQY6DrWWZLwNMDAMMIM1cm7jSK4UKBRBLF45vlfNBVLshITJstq5SWs58
szwTt8K99hSjpg==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH v4 6/6] Revert "maint: Generate 'doc/version.texi'
reproducibly."
Date: Wed, 17 Apr 2024 21:08:50 +0200
Message-ID: <1d8520a4b963a6e9c0d638c5a1eb43de122b20eb.1713379858.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713379858.git.janneke@HIDDEN>
References: <cover.1713379858.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Using `build-aux/mdate-from-git.scm' makes this no longer necessary.
This reverts commit e73ea7bd64f64709c71f89dfb111cf3e8ada3771.
Change-Id: I29d1e36b13d255e5a65b7348e7ae4f2b2c24a518
---
doc/local.mk | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/doc/local.mk b/doc/local.mk
index 77d48902b6..1d94e3c758 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -260,32 +260,6 @@ endif
# Reproducible tarball
-# Generate 'version.texi' reproducibly using metadata from Git rather than
-# using metadata from the filesystem. This is expected to generate warnings:
-#
-# Makefile:7376: warning: overriding recipe for target 'doc/stamp-vti'
-# Makefile:5098: warning: ignoring old recipe for target 'doc/stamp-vti'
-$(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure
- $$(AM_V_GEN)set -e; \
- export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \
- export TZ=UTC0; \
- timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \
- || echo $(SOURCE_DATE_EPOCH)) \
- dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \
- my=$$(date --date="@$$timestamp" "+%B %Y"); \
- { echo "@set UPDATED $$dmy"; \
- echo "@set UPDATED-MONTH $$my"; \
- echo "@set EDITION $(VERSION)"; \
- echo "@set VERSION $(VERSION)"; } > $@-t; \
- mv $@-t $@; \
- cp $@ $(srcdir)/doc/version.texi
-
-i:=0
-$(eval $(call version.texi-from-git,vti,doc/guix.texi,))
-$(foreach lang, $(MANUAL_LANGUAGES), \
- $(eval i=$(shell echo $$(($(i)+1)))) \
- $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).po,-$(lang))))
-
DIST_CONFIGURE_FLAGS = \
--localstatedir=/var \
--sysconfdir=/etc
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 19:09:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 15:09:37 2024
Received: from localhost ([127.0.0.1]:47614 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rxAf3-0000WQ-17
for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:37 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:37122)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rxAel-0000T0-Re
for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:20 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rxAeT-0003Ck-GR; Wed, 17 Apr 2024 15:09:01 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=8AejkK/u0zFIXXzdUR6ZcSPHi28dhCnV3kGEsT1Cpwc=; b=fCl7KgL3/ZqquzADK8af
Sy7fykAcGHi7L89WF09qsztpFS6wrlVd9U/C8Hj5s58L3HGpj/aXn6RdFJJuDSnViZeDnW8wyyG1z
45e3L2zRqZOXo5LKNb8VaAql6NxxokDx+hijPPMNO6friRRhAVC9QR1FFSD6yl6aUPUZaLthzajAn
fgQ7U9fjbl3JJkifsYJlOde5XA5BEOCeHqh3eJvz+xiH5a2Bidh1I0dbTWkknCmdWPd6RHQyOxkIk
QFuUyLrxQZaBElkuN43uAAMZmiOmw/5bBGq7kBxAacko5iX+m9K3ysA3w830ZKurkpoB1xZsnIQaR
TdiRnvm8/1Cifg==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH v4 5/6] Revert "maint: Generate 'doc/version-LANG.texi'
reproducibly."
Date: Wed, 17 Apr 2024 21:08:49 +0200
Message-ID: <cd3be58d80633491d6e1ca74e27756ac461a3e8d.1713379858.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713379858.git.janneke@HIDDEN>
References: <cover.1713379858.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Using `build-aux/mdate-from-git.scm' makes this no longer necessary.
This reverts commit 0e4ead187d83a958ca0deb54857c04967e84d68b.
Change-Id: I9177828f90fa7f7e256bc72fdff35a2fab355780
---
doc/local.mk | 40 +++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 23 deletions(-)
diff --git a/doc/local.mk b/doc/local.mk
index 130f40ece9..77d48902b6 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -260,32 +260,26 @@ endif
# Reproducible tarball
-# Define a rule to build `version[LANG].texi' reproducibly using metadata from
-# Git rather than using metadata from the filesystem.
-define version.texi-from-git
-$(srcdir)/doc/stamp-$(1): $(srcdir)/$(2) $(top_srcdir)/configure
- $$(AM_V_GEN)set -e; \
- export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \
- export TZ=UTC0; \
- timestamp="$$$$(git log --pretty=format:%ct -n1 -- "$$<" \
- 2>/dev/null \
- || echo $$(SOURCE_DATE_EPOCH))" \
- dmy=$$$$(date --date="@$$$$timestamp" "+%-d %B %Y"); \
- my=$$$$(date --date="@$$$$timestamp" "+%B %Y"); \
- { echo "@set UPDATED $$$$dmy"; \
- echo "@set UPDATED-MONTH $$$$my"; \
- echo "@set EDITION $$$(VERSION)"; \
- echo "@set VERSION $$$(VERSION)"; } > "$$@-t"; \
- mv "$$@-t" "$$@"; \
- cp -p "$$@" "$$(srcdir)/doc/version$(3).texi"
-endef
-
-# Generate rules for stamp-vti and stamp-N that create version.texi and
-# version-LANG.texi to override the Autotools versions that use timestamps
-# embedded in the file-system. These are expected to generate warnings:
+# Generate 'version.texi' reproducibly using metadata from Git rather than
+# using metadata from the filesystem. This is expected to generate warnings:
#
# Makefile:7376: warning: overriding recipe for target 'doc/stamp-vti'
# Makefile:5098: warning: ignoring old recipe for target 'doc/stamp-vti'
+$(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure
+ $$(AM_V_GEN)set -e; \
+ export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \
+ export TZ=UTC0; \
+ timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \
+ || echo $(SOURCE_DATE_EPOCH)) \
+ dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \
+ my=$$(date --date="@$$timestamp" "+%B %Y"); \
+ { echo "@set UPDATED $$dmy"; \
+ echo "@set UPDATED-MONTH $$my"; \
+ echo "@set EDITION $(VERSION)"; \
+ echo "@set VERSION $(VERSION)"; } > $@-t; \
+ mv $@-t $@; \
+ cp $@ $(srcdir)/doc/version.texi
+
i:=0
$(eval $(call version.texi-from-git,vti,doc/guix.texi,))
$(foreach lang, $(MANUAL_LANGUAGES), \
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 19:09:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 15:09:37 2024
Received: from localhost ([127.0.0.1]:47612 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rxAf1-0000WA-99
for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:36 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:37120)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rxAek-0000Sz-ND
for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:19 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rxAeS-0003C2-CW; Wed, 17 Apr 2024 15:09:00 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=pAj9hpVaz0gWAXN0wOF4Rx0ljjBYCgHbvitdhERiSUY=; b=shxH5dL2ncNeIFJNcQ8L
szJGuhGdp+gVrnGyWBv51Zp63KXruhMp/IShoWWFgFOpyPGPUb+MNrsEpjJsKdRnYbq3II4/YxhNO
i5GHpkLSt++cHon5VQgt9DqyEc2YN3GQyNUbq4KyJ9GPHacPmnqkt7MvArSN3CxzcO8HkNrCOCBuf
VMu2IlFwIu56pgl9VmA0qCiaZXJRenY02Cx9LV+M0USmm5nEwSwdkX7p9ofwKo6AjQsUHF4Im4VC4
ymhsJRZkxYqj+JvA3wEDRemNVy0tw/GApoZh1SZAW+8aCWozXIV88SflJwpw5VlCczOZX//jz8VJM
PUN/Fty1SiDu8Q==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH v4 4/6] maint: Generate doc/version[-LANG].texi using
`mdate-from-git.scm'.
Date: Wed, 17 Apr 2024 21:08:48 +0200
Message-ID: <5ab984e73310715a4b1d8b671c84eddcd5ccd699.1713379858.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713379858.git.janneke@HIDDEN>
References: <cover.1713379858.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
This replaces Automake's `build-aux/mdate-sh' with our own
`build-aux/mdate-from-git.scm' to use reproducible timestamps from Git
instead.
* build-aux/mdate-from-git.scm: New script.
* bootstrap: Use it to replace build-aux/mdate-sh.
* Makefile.am (EXTRA_DIST): Add it.
Change-Id: I17d0a7de9ffea397129c0db1728f86e28a4e245f
---
Makefile.am | 1 +
bootstrap | 8 +++-
build-aux/mdate-from-git.scm | 87 ++++++++++++++++++++++++++++++++++++
3 files changed, 95 insertions(+), 1 deletion(-)
create mode 100755 build-aux/mdate-from-git.scm
diff --git a/Makefile.am b/Makefile.am
index af08bc546f..92a7a85a01 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -724,6 +724,7 @@ EXTRA_DIST += \
build-aux/config.rpath \
build-aux/convert-xref.scm \
build-aux/generate-authors.scm \
+ build-aux/mdate-from-git.scm \
build-aux/test-driver.scm \
build-aux/update-NEWS.scm \
build-aux/update-guix-package.scm \
diff --git a/bootstrap b/bootstrap
index de024aeaa5..5bf83175e5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -24,4 +24,10 @@ for lang in ${langs}; do
fi
done
-exec autoreconf -vfi
+autoreconf -vfi
+
+# Replace Automake's build-aux/mdate-sh with build-aux/mdate-from-git, our
+# own, reproducible version.
+chmod +w build-aux/mdate-sh
+rm -f build-aux/mdate-sh
+ln -s mdate-from-git.scm build-aux/mdate-sh
diff --git a/build-aux/mdate-from-git.scm b/build-aux/mdate-from-git.scm
new file mode 100755
index 0000000000..a9e36031b4
--- /dev/null
+++ b/build-aux/mdate-from-git.scm
@@ -0,0 +1,87 @@
+#! /bin/sh
+# -*-scheme-*-
+export LANG=C LANGUAGE=C LC_TIME=C
+export TZ=UTC0
+exec guile --no-auto-compile -L $srcdir -C $srcdir -e '(mdate-from-git)' -s "$0" "$@"
+!#
+
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; This program is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;;; Commentary:
+;;;
+;;; Usage: mdate-from-git.scm FILE
+;;;
+;;; This script is compatible with Automake's `mdate-sh' but uses the timestamp
+;;; from Git instead of from the file system. Also, it can be appended to
+;;; mdate-sh.
+
+;;; As a special exception for Guix, it caters for doc/guix.LANG.texi files that
+;;; are not stored in Git, by using po/doc/guix-manual.LANG.po for the Git
+;;; timestamp. Test doing something like:
+;;;
+;;; build-aux/mdate-from-git.scm doc/guix.de.texi
+;;;
+;;;; Code:
+
+(define-module (mdate-from-git)
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 popen)
+ #:use-module (ice-9 rdelim)
+ #:use-module (ice-9 regex)
+ #:export (main))
+
+(define (pipe-command command)
+ (let* ((port (apply open-pipe* OPEN_READ command))
+ (output (read-string port)))
+ (close-port port)
+ output))
+
+(define (guix.LANG.texi->guix-manual.LANG.po file-name)
+ "Translated manuals doc/guix.LANG.texi are not tracked in Git and are
+generated from po/doc/guix-manual.LANG.po. For such an untraced .TEXI file,
+return its .PO counterpart."
+ (let ((m (string-match "doc/guix.([^.]+).texi" file-name)))
+ (if (not m) file-name
+ (let ((lang (match:substring m 1)))
+ (format #f "po/doc/guix-manual.~a.po" lang)))))
+
+
+;;;
+;;; Entry point.
+;;;
+(define (main args)
+ (match args
+ ((script file-name)
+ (let* ((command `("git" "ls-files" "--error-unmatch" "--" ,file-name))
+ (tracked? (zero? (with-error-to-port (%make-void-port "w")
+ (lambda _ (apply system* command)))))
+ (file-name (if tracked? file-name
+ (guix.LANG.texi->guix-manual.LANG.po file-name)))
+ (command `("git" "log" "--pretty=format:%ct" "-n1" "--" ,file-name))
+ (timestamp (with-error-to-port (%make-void-port "w")
+ (lambda _ (pipe-command command))))
+ (source-date-epoch (or (getenv "SOURCE_DATE_EPOCH") "1"))
+ (timestamp (if (string-null? timestamp) source-date-epoch
+ timestamp))
+ (time (gmtime (string->number timestamp)))
+ (d-m-y (strftime "%-d %B %Y" time)))
+ (display d-m-y)))
+ (_
+ (format (current-error-port) "Usage: mdate-from-git.scm FILE\n")
+ (exit 2))))
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 19:09:35 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 15:09:35 2024 Received: from localhost ([127.0.0.1]:47610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rxAez-0000Vp-B8 for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rxAej-0000Sy-IS for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:18 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rxAeR-0003Bt-7H; Wed, 17 Apr 2024 15:08:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=IRmOpwldwYaD2mOQkSA6gVAFsPXZTKsfVQvCGkNR0SI=; b=VcLZlOVIhQjtBzZwgljg etuv0Dkb8tvDzv9wl+zvUKo4R0OZEqAvi+0yGQvMnerZ9KSI1YMpdC8v1pu+Pz8CyA3cIkKh24VZK eBhrzHQWyiIsvXTlou+eejN4V0fQ5Aa33COONMZO15mrVpK5YbEBepT0rspE4vrabOwlWSXos5+8d nHgw/dhjIN6+VxaxZOxBdhCDYJS9T43aiU09GhIQTn8QgHHMhGks2d0OaTpE1i4QvlDxb4abtIAHf JVEub1tbhDONqDOg1KxreZLVoAd/8sI83W3kH5enRfy+eivv0/bf2H0k/kuIS9gHTiJFuVS3swls2 ZDm/1bMlJu9e4A==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70380 <at> debbugs.gnu.org Subject: [PATCH v4 3/6] maint: Cater for running `make dist' from tarball. Date: Wed, 17 Apr 2024 21:08:47 +0200 Message-ID: <b08c1af94ea36b341ba2ccb91d5a6341a48a4745.1713379858.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1713379858.git.janneke@HIDDEN> References: <cover.1713379858.git.janneke@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70380 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * Makefile.am: Use in_git_p conditional to disable Autotools' cache consistency assert and removal when bulding from tarball. (dist): Depend on doc-pot-update again when building from tarball. (dist-hook): Remove dependencies on gen-ChangeLog and gen-AUTHORS when building from tarball. (gen-ChangeLog, gen-AUTHORS): Remove guarding for building from tarball. Use set -e to avoid silently failing. (gen-tarball-version): Use $(SOURCE_DATE_EPOCH) instead of re-generating it using git; this also works running from a tarball. Change-Id: I9ebdd28a70837f6a4db610c4816bb283d176e2d9 --- Makefile.am | 60 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/Makefile.am b/Makefile.am index ca3fa0a693..af08bc546f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -955,6 +955,20 @@ guix-binary.%.tar.xz: guix` ; \ cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" +# The `dist' target has other dependencies when building from Git +# to assert and achieve reproducibility. +if in_git_p + +# The dependency on dist-doc-pot-update is to clean possibly stale doc and po +# files and only then generate the .pot files, which are not checked in. +dist: dist-doc-pot-update +dist-doc-pot-update: auto-clean + $(MAKE) guile$(EXEEXT) + $(MAKE) -C po/guix all + $(MAKE) -C po/packages all + $(MAKE) doc-pot-update + +dist-hook: gen-ChangeLog gen-AUTHORS # Assert that Autotools cache is up to date with Git, by checking # PACKAGE_VERSION against HEAD. Indented to get past Automake. @@ -969,20 +983,20 @@ guix-binary.%.tar.xz: $(error Cannot create reproducible tarball) else $(warning Tarball will be irreproducible; distdir will not get removed!) - endif - endif - endif + endif # !GUIX_ALLOW_IRREPRODUCIBLE_TARBALL + endif # PACKAGE_VERSION != git_version + endif # MAKECMDGOALS dist -# The dependency on dist-doc-pot-update is to clean possibly stale doc and po -# files and only then generate the .pot files, which are not checked in. -dist: dist-doc-pot-update -dist-doc-pot-update: auto-clean - $(MAKE) guile$(EXEEXT) - $(MAKE) -C po/guix all - $(MAKE) -C po/packages all - $(MAKE) doc-pot-update +else # !in_git_p + +dist: doc-pot-update -dist-hook: gen-ChangeLog gen-AUTHORS gen-tarball-version + ifeq ($(MAKECMDGOALS),dist) +$(warning Not using Git, tarball will likely be irreproducible!) + endif # MAKECMDGOALS dist +endif # !in_git_p + +dist-hook: gen-tarball-version dist-hook: assert-no-store-file-names distcheck-hook: assert-binaries-available assert-final-inputs-self-contained @@ -994,27 +1008,25 @@ $(top_srcdir)/.version: config.status gen-tarball-version: echo $(VERSION) > "$(distdir)/.tarball-version" - git show HEAD --format=%ct --no-patch > $(distdir)/.tarball-timestamp + echo $(SOURCE_DATE_EPOCH) > $(distdir)/.tarball-timestamp gen-ChangeLog: - $(AM_V_GEN)if test -e .git; then \ - export LC_ALL=en_US.UTF-8; \ - export TZ=UTC0; \ - $(top_srcdir)/build-aux/gitlog-to-changelog \ - > $(distdir)/ChangeLog.tmp; \ - rm -f $(distdir)/ChangeLog; \ - mv $(distdir)/ChangeLog.tmp $(distdir)/ChangeLog; \ - fi + $(AM_V_GEN)set -e; \ + export LC_ALL=en_US.UTF-8; \ + export TZ=UTC0; \ + $(top_srcdir)/build-aux/gitlog-to-changelog \ + > $(distdir)/ChangeLog.tmp; \ + rm -f $(distdir)/ChangeLog; \ + mv $(distdir)/ChangeLog.tmp $(distdir)/ChangeLog; gen-AUTHORS: - $(AM_V_GEN)if test -e .git; then \ + $(AM_V_GEN)set -e; \ rm -f "$(distdir)/AUTHORS"; \ export LC_ALL=en_US.UTF-8; \ export TZ=UTC0; \ $(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/generate-authors.scm" \ - "$(top_srcdir)" "$(distdir)/AUTHORS"; \ - fi + "$(top_srcdir)" "$(distdir)/AUTHORS"; # Like 'dist', but regenerate 'configure' so we get an up-to-date # 'PACKAGE_VERSION' string. (In Gnulib, 'GNUmakefile' has a special trick to -- 2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 19:09:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 15:09:19 2024
Received: from localhost ([127.0.0.1]:47601 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rxAek-0000TY-Gu
for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:19 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:48124)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rxAei-0000Sx-HY
for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:16 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rxAeQ-0003Bh-6c; Wed, 17 Apr 2024 15:08:58 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=ztA12dl/aUWyzZ8vc5YZx7nLhgxmYPtod4DsYEXdpUk=; b=cEFvvFTwOSrDa0miH/V6
WfQ0XEann1iTO3fPMJC2HHdhKjQF5wpHj1ENskvt+4fXDJ50fqXJ5tgBTpKybYYCzhaEl/nsrO/K9
akpjcjIndrAXECaB3952klHN7AlRCzoq2bHVfIkRy5EwF2jcl3wehOboDPqsq7VI/4RIBZtxTTma6
yY2N4ybpOOlxhunThz48CUOMETdYrBH0/Y8ExW6X5YLDy5FJMDFIDzuvG4gOxIXXEtBvLJRcMbJ8N
5OjgWJ/uaDAMdvxij5CIB8py7g7NQWLbnaPjJ/CWemcoobXujSE62QO4ZRoufbdOQPTgZatexMljZ
MxN7RkUi+zyuyw==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH v4 2/6] maint: Support `make doc-po-update' from tarball.
Date: Wed, 17 Apr 2024 21:08:46 +0200
Message-ID: <8c9f63715e8d7613c4a23fcccf828ccb5b323dae.1713379858.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713379858.git.janneke@HIDDEN>
References: <cover.1713379858.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* build-aux/xgettext.scm: Move setting of environment variables to shell
header.
(main): Use SOURCE_DATE_EPOCH as fallback for timestamp. This fixes running
from a tarball.
* Makefile.am (EXTRA_DIST): Add it.
Change-Id: Ic487587b22495868fd2a21545a13dc9e3458299c
---
Makefile.am | 1 +
build-aux/xgettext.scm | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 98008c528d..ca3fa0a693 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -727,6 +727,7 @@ EXTRA_DIST += \
build-aux/test-driver.scm \
build-aux/update-NEWS.scm \
build-aux/update-guix-package.scm \
+ build-aux/xgettext.scm \
doc/build.scm \
etc/disarchive-manifest.scm \
etc/guix-install.sh \
diff --git a/build-aux/xgettext.scm b/build-aux/xgettext.scm
index 44d30b8149..7142336a9d 100755
--- a/build-aux/xgettext.scm
+++ b/build-aux/xgettext.scm
@@ -2,6 +2,8 @@
# -*-scheme-*-
build_aux=$(dirname $0)
srcdir=$build_aux/..
+export LC_ALL=en_US.UTF-8
+export TZ=UTC0
exec guile --no-auto-compile -L $srcdir -C $srcdir -e main -s "$0" "$@"
!#
@@ -59,9 +61,6 @@ (define (pipe-command command)
;;; Entry point.
;;;
(define (main args)
- ;; Cater for being run in a container.
- (setenv "LC_ALL" "en_US.UTF-8")
- (setenv "TZ" "UTC0")
(fluid-set! %default-port-encoding #f)
(let* ((files-from (get-option args "--files-from="))
(default-domain (get-option args "--default-domain="))
@@ -82,9 +81,10 @@ (define (main args)
(files (map (cute string-append directory "/" <>) files))
(git-command `("git" "log" "--pretty=format:%ci" "-n1" ,@files))
(timestamp (pipe-command git-command))
+ (source-date-epoch (or (getenv "SOURCE_DATE_EPOCH") "1"))
+ (timestamp (if (string-null? timestamp) source-date-epoch
+ timestamp))
(po-file (string-append default-domain ".po")))
- (when (string-null? timestamp)
- (exit 1))
(substitute* po-file
(("(\"POT-Creation-Date: )[^\\]*" all header)
(string-append header timestamp)))))))
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 19:09:18 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 15:09:18 2024 Received: from localhost ([127.0.0.1]:47599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rxAej-0000TL-S1 for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rxAeh-0000Sv-8q for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:16 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rxAeO-0003BN-DY; Wed, 17 Apr 2024 15:08:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=7LVRT0ZwKdzefwjGmAiEkZMx5G5nxI0zGBARrz9YRg4=; b=KJtv8IT+mevb3P +lFkSIaDEJymzmxDQH6piiB5h2VRggIxKiw3RT5L9h6PjeCmWxNzGT7Fp0hO3sF9rpH/Y2Nzg3TXB 1gNCJ+r8SevBxB19YxAfP3rX5T+T48o9CVXDOYgLuPGTWoMUL4JLDKv+69HPX1T2/PvAJENVjI5gM qR9rrMq7qhyldTHXqR55qISdQB4+w/bOWjWjGF3Qhny/2G1kZ/0rnnEBzIjFUa1Ci19W3rFLoAHIa JQwY/mGizJf6t7sa2mo47yE5AKVhXkMWva+z08AXjxzajpkoIOp/HyHP3/HrLaNFOmx14ciqDY2J8 FJfFjnbxMoygMo3E/p6w==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70380 <at> debbugs.gnu.org Subject: [PATCH v4 0/6] Reproducible `make dist' tarball: Avoid override stamp-N warnings. Date: Wed, 17 Apr 2024 21:08:44 +0200 Message-ID: <cover.1713379858.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70380 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) New in V4: * Move in_git_p check from GNU make to configure.ac, in order to, * Ressurrect running `make' from a tarball, * Have xgettext.scm support being run from a tarball, and, * Distribute xgettext.scm, in order to, * Support running update-po from a tarball. Note that running `make' from a tarball has been broken for almost a year now and has nothing to do with any of the reproducible tarball work. Apparently that bug has a low priority at the moment and including it here creeps the scope maybe a little but probably helps more with the review. Greetings, Janneke Janneke Nieuwenhuizen (6): maint: Resurrect running `make' from a tarball. maint: Support `make doc-po-update' from tarball. maint: Cater for running `make dist' from tarball. maint: Generate doc/version[-LANG].texi using `mdate-from-git.scm'. Revert "maint: Generate 'doc/version-LANG.texi' reproducibly." Revert "maint: Generate 'doc/version.texi' reproducibly." Makefile.am | 67 +++++++++++++++++---------- bootstrap | 8 +++- build-aux/mdate-from-git.scm | 87 ++++++++++++++++++++++++++++++++++++ build-aux/xgettext.scm | 10 ++--- configure.ac | 10 +++++ doc/local.mk | 32 ------------- 6 files changed, 152 insertions(+), 62 deletions(-) create mode 100755 build-aux/mdate-from-git.scm base-commit: 2126dab4cd81db4cbde4566d8c638e45a4c0077c -- 2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 19:09:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 15:09:17 2024
Received: from localhost ([127.0.0.1]:47595 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rxAej-0000TJ-D6
for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:17 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:48116)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rxAeh-0000Sw-Lm
for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:09:16 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rxAeP-0003BY-9n; Wed, 17 Apr 2024 15:08:57 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=e3nICThubp5PXYfJbD5e8q1uNGCvl7PKjipBv9NaYCI=; b=dq5AsOxM3uF9uubOSB4r
HquqRozeL6GwM/yWc/LDiIWbeYliO6a+KPLm6qaFiH1VFPYwhs5xfgsZH/K9nwcZ7IXZ/vfNfv4ao
cndHDnVGMrszS+FJrbH00YIV7YF8BJV68Sg42ePvJb+mMo9i3Lm9tVuGya9hWpEWpKD9KD8dPpQoD
rQf60Nbl2HMh/KxrwxATH4r5bqCkCNemC5XqP7IDA1khmyHD74t8qx2FREE3OR1L1zGSGRT668gjx
RSb93nF5giKpjeeceu0q4NnPsY14JHaXekpVkgMIvLJDQpV7i0pNAck+s7cCwuLldVdL0i5Ux8P0n
8dLED6vKfgJGBQ==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH v4 1/6] maint: Resurrect running `make' from a tarball.
Date: Wed, 17 Apr 2024 21:08:45 +0200
Message-ID: <543d5a5e035e6a6dc68013393cc470dcf1dc0772.1713379858.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713379858.git.janneke@HIDDEN>
References: <cover.1713379858.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
This is a follow-up to commit
8b972da068708a8b17f3ab153ea940690ca49ca9
Makefile.am: Auto-configure Git on 'make'.
* configure.ac (in_git_p): New conditional.
* Makefile.am (nodist_noinst_DATA): Use it to only enable this when building
from Git.
Change-Id: I09a90a59a4933a8cdb04124467d38209171f2a57
---
Makefile.am | 5 +++++
configure.ac | 10 ++++++++++
2 files changed, 15 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 25b3eb3378..98008c528d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1241,7 +1241,12 @@ COMMIT_MSG_MAGIC = VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg=
cp etc/git/commit-msg $@; \
fi
+# The etc/git/ config files are not distributed and have no use when building
+# from a tarball. Do not add dependencies on these to *_DATA when building
+# from a tarball, as that breaks the build.
+if in_git_p
nodist_noinst_DATA = .git/hooks/pre-push .git/config .git/hooks/commit-msg
+endif
# Downloading up-to-date PO files.
diff --git a/configure.ac b/configure.ac
index ecbd596a34..8c3a06da37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -265,6 +265,16 @@ dnl Documentation translation.
AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate])
AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo])
+AC_MSG_CHECKING([if building from git])
+if test -e .git; then
+ in_git_p=yes
+else
+ in_git_p=no
+fi
+AC_MSG_RESULT([$in_git_p])
+AM_CONDITIONAL([in_git_p],
+ [test "x$in_git_p" = "xyes"])
+
case "$storedir" in
/gnu/store)
;;
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 19:03:49 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 15:03:49 2024 Received: from localhost ([127.0.0.1]:47565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rxAZO-0008Gy-GX for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:03:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rxAZK-0008F5-AR for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 15:03:44 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rxAZ0-00024k-BS; Wed, 17 Apr 2024 15:03:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=6OruMmRRGS+/TtE/ZxPpkmbt2AoLRjjj1NaU2Y6MAns=; b=NYQ8SaFx5E9jdaJaE98T W2Ou1v+ttbQi7jH9jfgsGuXEzC8Zw0sN2BGU49CjFU8f2RR2YaCaKYkzDpKjhdYp/6ds3eRszR6mp vla3q5LJYMG1TvkFmqFA1qBeBSoblKM4J485t0e2ulZn4aAfTTzazI0PmaxVKUITMeXWCMdLieBsi 6w7wD11BCe2sJ5UZgpd9Tz5A/tS2vRwHyukdsbehFihQDKUO5T0e75PyRtFYORJQOOLO2jI6sYqr8 SsaEH09E8engn/x4ePwbPMQwsG41z+J2zUMjqIdCduWW/ZhgOJojo7rlOO6pK3XXOFad/d9SewcxM qDpTKGTqlbptXA==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> Subject: Re: [bug#70380] [PATCH v3 1/4] maint: Cater for running `make dist' from tarball. In-Reply-To: <87jzkwov9t.fsf@HIDDEN> (pelzflorian@HIDDEN's message of "Wed, 17 Apr 2024 17:37:18 +0200") Organization: AvatarAcademy.nl References: <cover.1713340673.git.janneke@HIDDEN> <9dd6e4436bcc0639cbbae2d468e5bc3760d73aa3.1713340673.git.janneke@HIDDEN> <87jzkwov9t.fsf@HIDDEN> X-Url: http://AvatarAcademy.nl Date: Wed, 17 Apr 2024 21:02:54 +0200 Message-ID: <87plunyfq9.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70380 Cc: 70380 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) pelzflorian (Florian Pelz) writes: Hello Florian, > Hello Jan. Thank you for fixing =E2=80=9Cmake dist=E2=80=9D from a tarba= ll, which > admittedly is far-fetched. However, =E2=80=9Cmake=E2=80=9D from a tarbal= l is not > actually fixed=C2=A0/ catered for and is essential. Ouch, how did I miss that? > [100%] GUILEC guix/scripts/discover.go > [100%] GUILEC guix/scripts/offload.go > HELP2MAN doc/guix-daemon.1 > make[2]: *** No rule to make target 'etc/git/pre-push', needed by '.git/h= ooks/pre-push'. Stop. > make[2]: Leaving directory '/home/florian/guix-1.3.0.58013-5dfeb' > make[1]: *** [Makefile:6304: all-recursive] Error 1 > make[1]: Leaving directory '/home/florian/guix-1.3.0.58013-5dfeb' > make: *** [Makefile:4371: all] Error 2 > > I suppose it is not actually your fault, but since you know how to fix > it, would you fix it? Ah, indeed. It was broken almost a year ago. Your suggestion makes much sense to me, so I'm including a new patch in V4 to address this. It required moving in_git_p from GNU make to to configure.ac and introducing it earlier. > Note that the non-fatal =E2=80=9C./bootstrap=E2=80=9D errors from tarball= (sh: line 1: > build-aux/git-version-gen: No such file or directory ) are not fixed > either, but they are not fatal. Yes, I don't know what to do about it. Looks like an Autotools bug to me. > Janneke Nieuwenhuizen <janneke@HIDDEN> writes: >> +dist: doc-pot-update >> +$(warning Not using Git, tarball will likely be irreproducible!) > > I get this warning when running =E2=80=9Cmake=E2=80=9D from a tarball, no= t only =E2=80=9Cmake > dist=E2=80=9D. Oops, fixed in V4. > However (!) =E2=80=9Cmake dist=E2=80=9D from the same (rebuilt reproducib= ly from > the git repo with your patches) tarball on another machine is in my case > perfectly reproducible, so could you just drop the warning? Hmm. You're probably rightt. I tried touching files, run update-po, but reproducibility seems pretty resilient to such changes. I've chosen to keep it anyway just to discourage maintainers from doing such a thing. > Thank you for making Guix more secure. Most happy to. Thanks for your reviews! Greetings, Janneke --=20 Janneke Nieuwenhuizen <janneke@HIDDEN> | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 15:37:55 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 11:37:54 2024 Received: from localhost ([127.0.0.1]:46584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rx7M5-0003eU-3b for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 11:37:53 -0400 Received: from relay.yourmailgateway.de ([188.68.63.98]:39145) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pelzflorian@HIDDEN>) id 1rx7Lv-0003d5-7g for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 11:37:45 -0400 Received: from mors-relay-2501.netcup.net (localhost [127.0.0.1]) by mors-relay-2501.netcup.net (Postfix) with ESMTPS id 4VKQ5J647Fz6410; Wed, 17 Apr 2024 17:37:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1713368244; bh=WWg+vTiV7Ovd0w2yoBrQyTol4TTMLR2cV4PciwsyLn4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=W/a+WOPI/tAj0Yv6qD5YFkLgOTk43/KedC3S5OtJVRv7WBAr4uGPYCf5pzts0Mmg8 +oorGX+qHrrTsLrOjsAphQ997z2SDJZxCXtLCKT/AR/y7S4JuvtKQ8+mTmzqjVydF/ wdwEGr8zV8AeeaWSh0HQ3uozE1jeJ8fT8cnwbAzLAZBj0F3iKmZ1+iX81Ek3O3iKjW EhC5sRMeCCe+DHriJ2d6GceBop96/CKC1/ocA+c7FB3szi4UIlYFtLf2u/w+AZ6bbi Ruzifj+sRGJGKmn+76+PcI+ssHxIhbCI8aXujs9HAaP5lhvwqg6oAisEiXKteBX0xV KDDK+yxPgn7Vw== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-2501.netcup.net (Postfix) with ESMTPS id 4VKQ5J5N1cz4xVF; Wed, 17 Apr 2024 17:37:24 +0200 (CEST) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4VKQ5J3Nr8z8sbD; Wed, 17 Apr 2024 17:37:24 +0200 (CEST) Received: from florianrock64 (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id E22BE83941; Wed, 17 Apr 2024 17:37:18 +0200 (CEST) From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: [bug#70380] [PATCH v3 1/4] maint: Cater for running `make dist' from tarball. In-Reply-To: <9dd6e4436bcc0639cbbae2d468e5bc3760d73aa3.1713340673.git.janneke@HIDDEN> (Janneke Nieuwenhuizen's message of "Wed, 17 Apr 2024 11:53:28 +0200") References: <cover.1713340673.git.janneke@HIDDEN> <9dd6e4436bcc0639cbbae2d468e5bc3760d73aa3.1713340673.git.janneke@HIDDEN> Date: Wed, 17 Apr 2024 17:37:18 +0200 Message-ID: <87jzkwov9t.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: E22BE83941 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: PAkW3Oy6PpQWMchiU3C/iAaulrEOCdl7qow0Y/7f9Y5mElkzSkuObbJR X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70380 Cc: 70380 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hello Jan. Thank you for fixing =E2=80=9Cmake dist=E2=80=9D from a tarball= , which admittedly is far-fetched. However, =E2=80=9Cmake=E2=80=9D from a tarball = is not actually fixed=C2=A0/ catered for and is essential. [100%] GUILEC guix/scripts/discover.go [100%] GUILEC guix/scripts/offload.go HELP2MAN doc/guix-daemon.1 make[2]: *** No rule to make target 'etc/git/pre-push', needed by '.git/hoo= ks/pre-push'. Stop. make[2]: Leaving directory '/home/florian/guix-1.3.0.58013-5dfeb' make[1]: *** [Makefile:6304: all-recursive] Error 1 make[1]: Leaving directory '/home/florian/guix-1.3.0.58013-5dfeb' make: *** [Makefile:4371: all] Error 2 I suppose it is not actually your fault, but since you know how to fix it, would you fix it? Note that the non-fatal =E2=80=9C./bootstrap=E2=80=9D errors from tarball (= sh: line 1: build-aux/git-version-gen: No such file or directory ) are not fixed either, but they are not fatal. Janneke Nieuwenhuizen <janneke@HIDDEN> writes: > +dist: doc-pot-update > +$(warning Not using Git, tarball will likely be irreproducible!) I get this warning when running =E2=80=9Cmake=E2=80=9D from a tarball, not = only =E2=80=9Cmake dist=E2=80=9D. However (!) =E2=80=9Cmake dist=E2=80=9D from the same (rebu= ilt reproducibly from the git repo with your patches) tarball on another machine is in my case perfectly reproducible, so could you just drop the warning? Thank you for making Guix more secure. Regards, Florian
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 09:54:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 05:54:21 2024
Received: from localhost ([127.0.0.1]:45803 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rx1zg-0005F5-05
for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 05:54:21 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:53784)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rx1zK-0005A5-Ux
for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 05:54:05 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rx1z2-0006ey-BA; Wed, 17 Apr 2024 05:53:40 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=sVDCoqtAM4adlxC6uod3PnFyYqEQbxGaRNsCC4styP4=; b=nwNsBZS4MnknhkOsXRix
qxjOoFFWBcN1qn1PZv/4n+PiuqCJfInwik2sk4GglDOjMWGlratdGHfBxHCHZk3c6gkNtmlXdWxoR
VqE7XRDsTnG4bh5NhPnxG31E4AQDwZX4bF0eXO0yfH8q41R32e+Oy4telcObQLujTCcmdTwngmuqo
pB/48j/a4s9iyAwfibmilgz+5ywS25Sq6GXcaaezziiBOk65vqzgqvYA4SIOAmylg25IlquK49Smr
oZYx66WVt6+GhGphAUgmMBmkTooICFeeJi494NZxMyhMQ+Z9Vh4CAYCTpj1qy1XmcVXeM1dUB8MP5
gNBOcRl2cgYHbA==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH v3 2/4] maint: Generate doc/version[-LANG].texi using
`mdate-from-git.scm'.
Date: Wed, 17 Apr 2024 11:53:29 +0200
Message-ID: <93b2d3b1b675dfd3018d0b3005d19bdbdd97b629.1713340673.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713340673.git.janneke@HIDDEN>
References: <cover.1713340673.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
This replaces Automake's `build-aux/mdate-sh' with our own
`build-aux/mdate-from-git.scm' to use reproducible timestamps from Git
instead.
* build-aux/mdate-from-git.scm: New script.
* bootstrap: Use it to replace build-aux/mdate-sh.
* Makefile.am (EXTRA_DIST): Add it.
Change-Id: I17d0a7de9ffea397129c0db1728f86e28a4e245f
---
Makefile.am | 1 +
bootstrap | 8 +++-
build-aux/mdate-from-git.scm | 86 ++++++++++++++++++++++++++++++++++++
3 files changed, 94 insertions(+), 1 deletion(-)
create mode 100755 build-aux/mdate-from-git.scm
diff --git a/Makefile.am b/Makefile.am
index 39cf4b4b17..1de8149772 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -723,6 +723,7 @@ EXTRA_DIST += \
build-aux/config.rpath \
build-aux/convert-xref.scm \
build-aux/generate-authors.scm \
+ build-aux/mdate-from-git.scm \
build-aux/test-driver.scm \
build-aux/update-NEWS.scm \
build-aux/update-guix-package.scm \
diff --git a/bootstrap b/bootstrap
index de024aeaa5..5bf83175e5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -24,4 +24,10 @@ for lang in ${langs}; do
fi
done
-exec autoreconf -vfi
+autoreconf -vfi
+
+# Replace Automake's build-aux/mdate-sh with build-aux/mdate-from-git, our
+# own, reproducible version.
+chmod +w build-aux/mdate-sh
+rm -f build-aux/mdate-sh
+ln -s mdate-from-git.scm build-aux/mdate-sh
diff --git a/build-aux/mdate-from-git.scm b/build-aux/mdate-from-git.scm
new file mode 100755
index 0000000000..abe7e97f32
--- /dev/null
+++ b/build-aux/mdate-from-git.scm
@@ -0,0 +1,86 @@
+#! /bin/sh
+# -*-scheme-*-
+export LANG=C LANGUAGE=C LC_TIME=C
+export TZ=UTC0
+exec guile --no-auto-compile -L $srcdir -C $srcdir -e '(mdate-from-git)' -s "$0" "$@"
+!#
+
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; This program is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;;; Commentary:
+;;;
+;;; Usage: mdate-from-git.scm FILE
+;;;
+;;; This script is compatible with Automake's `mdate-sh' but uses the timestamp
+;;; from Git instead of from the file system. Also, it can be appended to
+;;; mdate-sh.
+
+;;; As a special exception for Guix, it caters for doc/guix.LANG.texi files that
+;;; are not stored in Git, by using po/doc/guix-manual.LANG.po for the Git
+;;; timestamp. Test doing something like:
+;;;
+;;; build-aux/mdate-from-git.scm doc/guix.de.texi
+;;;
+;;;; Code:
+
+(define-module (mdate-from-git)
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 popen)
+ #:use-module (ice-9 rdelim)
+ #:use-module (ice-9 regex)
+ #:export (main))
+
+(define (pipe-command command)
+ (let* ((port (apply open-pipe* OPEN_READ command))
+ (output (read-string port)))
+ (close-port port)
+ output))
+
+(define (guix.LANG.texi->guix-manual.LANG.po file-name)
+ "Translated manuals doc/guix.LANG.texi are not tracked in Git and are
+generated from po/doc/guix-manual.LANG.po. For such an untraced .TEXI file,
+return its .PO counterpart."
+ (let ((m (string-match "doc/guix.([^.]+).texi" file-name)))
+ (if (not m) file-name
+ (let ((lang (match:substring m 1)))
+ (format #f "po/doc/guix-manual.~a.po" lang)))))
+
+
+;;;
+;;; Entry point.
+;;;
+(define (main args)
+ (match args
+ ((script file-name)
+ (let* ((command `("git" "ls-files" "--error-unmatch" "--" ,file-name))
+ (tracked? (zero? (with-error-to-port (%make-void-port "w")
+ (lambda _ (apply system* command)))))
+ (file-name (if tracked? file-name
+ (guix.LANG.texi->guix-manual.LANG.po file-name)))
+ (command `("git" "log" "--pretty=format:%ct" "-n1" "--" ,file-name))
+ (timestamp (pipe-command command))
+ (source-date-epoch (or (getenv "SOURCE_DATE_EPOCH") "1"))
+ (timestamp (if (string-null? timestamp) source-date-epoch
+ timestamp))
+ (time (gmtime (string->number timestamp)))
+ (d-m-y (strftime "%-d %B %Y" time)))
+ (display d-m-y)))
+ (_
+ (format (current-error-port) "Usage: mdate-from-git.scm FILE\n")
+ (exit 2))))
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 09:54:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 05:54:20 2024
Received: from localhost ([127.0.0.1]:45801 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rx1zf-0005Ex-B3
for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 05:54:19 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:53790)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rx1zL-0005A8-Eg
for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 05:54:05 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rx1z3-0006fB-72; Wed, 17 Apr 2024 05:53:41 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=8AejkK/u0zFIXXzdUR6ZcSPHi28dhCnV3kGEsT1Cpwc=; b=baD2zvu9QuiQipL0LnOW
ezPZHLGvFVXls9L7JeCF23CIYhcyj/TtRrPcB4Bz5Ibwee+UHnwM7vO+Waveorl5pDxg62MKx2+g8
f51En1Mt/FvKX4u1Ma/XggwumtAW2myGsS83FNNBE+vp79FV0vo2GpMovbxs3QGf30J/dCI5GlV3O
p0z+dOlf2YUB6T15TOSEsIODg3OWIy6INU35rxlLXR4yvdFX2RxGqua+EV1b3gmLF0RkO7KIM+eNo
frGYrecW017ajtjMqoqTUf5Y+/IVPOQHAIvXoMedz8jCoYQU1tvN8rir0R0jQhnX0b7VWf/huCAU5
AziTqya11xWu5w==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH v3 3/4] Revert "maint: Generate 'doc/version-LANG.texi'
reproducibly."
Date: Wed, 17 Apr 2024 11:53:30 +0200
Message-ID: <99333fca4662a435c68d6a54f5f6e28aecc21103.1713340674.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713340673.git.janneke@HIDDEN>
References: <cover.1713340673.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Using `build-aux/mdate-from-git.scm' makes this no longer necessary.
This reverts commit 0e4ead187d83a958ca0deb54857c04967e84d68b.
Change-Id: I9177828f90fa7f7e256bc72fdff35a2fab355780
---
doc/local.mk | 40 +++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 23 deletions(-)
diff --git a/doc/local.mk b/doc/local.mk
index 130f40ece9..77d48902b6 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -260,32 +260,26 @@ endif
# Reproducible tarball
-# Define a rule to build `version[LANG].texi' reproducibly using metadata from
-# Git rather than using metadata from the filesystem.
-define version.texi-from-git
-$(srcdir)/doc/stamp-$(1): $(srcdir)/$(2) $(top_srcdir)/configure
- $$(AM_V_GEN)set -e; \
- export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \
- export TZ=UTC0; \
- timestamp="$$$$(git log --pretty=format:%ct -n1 -- "$$<" \
- 2>/dev/null \
- || echo $$(SOURCE_DATE_EPOCH))" \
- dmy=$$$$(date --date="@$$$$timestamp" "+%-d %B %Y"); \
- my=$$$$(date --date="@$$$$timestamp" "+%B %Y"); \
- { echo "@set UPDATED $$$$dmy"; \
- echo "@set UPDATED-MONTH $$$$my"; \
- echo "@set EDITION $$$(VERSION)"; \
- echo "@set VERSION $$$(VERSION)"; } > "$$@-t"; \
- mv "$$@-t" "$$@"; \
- cp -p "$$@" "$$(srcdir)/doc/version$(3).texi"
-endef
-
-# Generate rules for stamp-vti and stamp-N that create version.texi and
-# version-LANG.texi to override the Autotools versions that use timestamps
-# embedded in the file-system. These are expected to generate warnings:
+# Generate 'version.texi' reproducibly using metadata from Git rather than
+# using metadata from the filesystem. This is expected to generate warnings:
#
# Makefile:7376: warning: overriding recipe for target 'doc/stamp-vti'
# Makefile:5098: warning: ignoring old recipe for target 'doc/stamp-vti'
+$(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure
+ $$(AM_V_GEN)set -e; \
+ export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \
+ export TZ=UTC0; \
+ timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \
+ || echo $(SOURCE_DATE_EPOCH)) \
+ dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \
+ my=$$(date --date="@$$timestamp" "+%B %Y"); \
+ { echo "@set UPDATED $$dmy"; \
+ echo "@set UPDATED-MONTH $$my"; \
+ echo "@set EDITION $(VERSION)"; \
+ echo "@set VERSION $(VERSION)"; } > $@-t; \
+ mv $@-t $@; \
+ cp $@ $(srcdir)/doc/version.texi
+
i:=0
$(eval $(call version.texi-from-git,vti,doc/guix.texi,))
$(foreach lang, $(MANUAL_LANGUAGES), \
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 09:54:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 05:54:19 2024
Received: from localhost ([127.0.0.1]:45799 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rx1ze-0005En-Om
for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 05:54:19 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:53794)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rx1zM-0005AD-8c
for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 05:54:05 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rx1z4-0006fR-2G; Wed, 17 Apr 2024 05:53:42 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=/IgthRV+DK3fnFHAK0ShArj105AC7+Zsb6GJNQqs/Q0=; b=e/03Bk38tp5GJ7u0t9kG
I8qZ0dJXNhwQ4AdcuPObtqqTKC6V0FXSyOMavIfAxDNeLSshMPOHiaOGZzIznUWEeAviBIqd45fMb
G2HmLUS4eWF7fhEzGdu8psOy0IDI2CtWIZ4PAlhSYVjdJspBYtrMso1bFWxyJin2NatrPuFPmW/ym
AZ4mjFWBYlvHeKvPn05B6jvv+4EXxDM3ykqrghq7J9LdGo6LcGsHm2UXPLbxigGAygud6A7S2Sno6
kUeWgAuvWDXyvweo8t/sGYI62VPIeD6W6fvUBq9iemC1EuTpAwFZZ0soCNvLNOXE80SYPGFV82E2J
3xcCnFBpSgKfkw==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH v3 4/4] Revert "maint: Generate 'doc/version.texi'
reproducibly."
Date: Wed, 17 Apr 2024 11:53:31 +0200
Message-ID: <8de809241c8abd7ec234fcc8da2590074a5fc828.1713340674.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713340673.git.janneke@HIDDEN>
References: <cover.1713340673.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Using `build-aux/mdate-from-git.scm' makes this no longer necessary.
This reverts commit e73ea7bd64f64709c71f89dfb111cf3e8ada3771.
Change-Id: I29d1e36b13d255e5a65b7348e7ae4f2b2c24a518
---
doc/local.mk | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/doc/local.mk b/doc/local.mk
index 77d48902b6..1d94e3c758 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -260,32 +260,6 @@ endif
# Reproducible tarball
-# Generate 'version.texi' reproducibly using metadata from Git rather than
-# using metadata from the filesystem. This is expected to generate warnings:
-#
-# Makefile:7376: warning: overriding recipe for target 'doc/stamp-vti'
-# Makefile:5098: warning: ignoring old recipe for target 'doc/stamp-vti'
-$(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure
- $$(AM_V_GEN)set -e; \
- export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \
- export TZ=UTC0; \
- timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \
- || echo $(SOURCE_DATE_EPOCH)) \
- dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \
- my=$$(date --date="@$$timestamp" "+%B %Y"); \
- { echo "@set UPDATED $$dmy"; \
- echo "@set UPDATED-MONTH $$my"; \
- echo "@set EDITION $(VERSION)"; \
- echo "@set VERSION $(VERSION)"; } > $@-t; \
- mv $@-t $@; \
- cp $@ $(srcdir)/doc/version.texi
-
-i:=0
-$(eval $(call version.texi-from-git,vti,doc/guix.texi,))
-$(foreach lang, $(MANUAL_LANGUAGES), \
- $(eval i=$(shell echo $$(($(i)+1)))) \
- $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).po,-$(lang))))
-
DIST_CONFIGURE_FLAGS = \
--localstatedir=/var \
--sysconfdir=/etc
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 09:54:18 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 05:54:18 2024 Received: from localhost ([127.0.0.1]:45797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rx1zd-0005Ei-Rd for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 05:54:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rx1zK-0005A4-Sj for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 05:54:02 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rx1z1-0006es-Fo; Wed, 17 Apr 2024 05:53:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=MhHY04uxLV0WTTKnYE3iau0XCscxWbzEGZlawrxhJj0=; b=iEI8NQEDWc53Y5xAQXf5 Cb7wCEmczl6vLBN1NLM1tNnuzN0hi7oMxQICVh1se8u1cFJYVpQ5UiNy+1wilCSL8NiRnlMimeYA6 fQY4obWbsz33/S0cz9znhmd2pTD4dRSj/hsOJ2fbgzJ5bYUb90IbOUR7eiv3Hgz8ifUG09ek9EEMN QFgkyxyblMuqD11hbTPTYxirijsjKSbOGlnN6RPv8FiS1CGA7k8oK0aLweTLgR96ULMojHhZ7dO9k AIfw6ZkG9a/xGqOUutngYjyDGj9GeybR9DVwpC7xLkEl9K1KdyUjWK6AWtrYkjfknHHt1Axnjx4LO hIoKdvP3sEd0NQ==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70380 <at> debbugs.gnu.org Subject: [PATCH v3 1/4] maint: Cater for running `make dist' from tarball. Date: Wed, 17 Apr 2024 11:53:28 +0200 Message-ID: <9dd6e4436bcc0639cbbae2d468e5bc3760d73aa3.1713340673.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1713340673.git.janneke@HIDDEN> References: <cover.1713340673.git.janneke@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70380 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * Makefile.am (in_git_p): New variable. Use it to disable Autotools' cache consistency assert and removal when bulding from tarball. (dist): Depend on doc-pot-update again when building from tarball. (dist-hook): Remove dependencies on gen-ChangeLog and gen-AUTHORS when building from tarball. (gen-ChangeLog, gen-AUTHORS): Remove guarding for building from tarball. Use set -e to avoid silently failing. (gen-tarball-version): Use $(SOURCE_DATE_EPOCH) instead of re-generating it using git; this also works running from a tarball. Change-Id: I9ebdd28a70837f6a4db610c4816bb283d176e2d9 --- Makefile.am | 61 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/Makefile.am b/Makefile.am index 147767ece4..39cf4b4b17 100644 --- a/Makefile.am +++ b/Makefile.am @@ -953,9 +953,24 @@ guix-binary.%.tar.xz: guix` ; \ cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" +# The `dist' target has other dependencies when building from Git +# to assert and achieve reproducibility. Indented to get past Automake. +in_git_p = $(shell test -e .git && echo true) + ifeq ($(in_git_p),true) + +# The dependency on dist-doc-pot-update is to clean possibly stale doc and po +# files and only then generate the .pot files, which are not checked in. +dist: dist-doc-pot-update +dist-doc-pot-update: auto-clean + $(MAKE) guile$(EXEEXT) + $(MAKE) -C po/guix all + $(MAKE) -C po/packages all + $(MAKE) doc-pot-update + +dist-hook: gen-ChangeLog gen-AUTHORS # Assert that Autotools cache is up to date with Git, by checking -# PACKAGE_VERSION against HEAD. Indented to get past Automake. +# PACKAGE_VERSION against HEAD. ifeq ($(MAKECMDGOALS),dist) git_version = $(shell build-aux/git-version-gen .tarball-version) ifneq ($(PACKAGE_VERSION),$(git_version)) @@ -967,20 +982,18 @@ guix-binary.%.tar.xz: $(error Cannot create reproducible tarball) else $(warning Tarball will be irreproducible; distdir will not get removed!) - endif - endif - endif + endif # !GUIX_ALLOW_IRREPRODUCIBLE_TARBALL + endif # PACKAGE_VERSION != git_version + endif # MAKECMDGOALS dist -# The dependency on dist-doc-pot-update is to clean possibly stale doc and po -# files and only then generate the .pot files, which are not checked in. -dist: dist-doc-pot-update -dist-doc-pot-update: auto-clean - $(MAKE) guile$(EXEEXT) - $(MAKE) -C po/guix all - $(MAKE) -C po/packages all - $(MAKE) doc-pot-update + else # !in_git_p -dist-hook: gen-ChangeLog gen-AUTHORS gen-tarball-version +dist: doc-pot-update +$(warning Not using Git, tarball will likely be irreproducible!) + + endif # !in_git_p + +dist-hook: gen-tarball-version dist-hook: assert-no-store-file-names distcheck-hook: assert-binaries-available assert-final-inputs-self-contained @@ -992,27 +1005,25 @@ $(top_srcdir)/.version: config.status gen-tarball-version: echo $(VERSION) > "$(distdir)/.tarball-version" - git show HEAD --format=%ct --no-patch > $(distdir)/.tarball-timestamp + echo $(SOURCE_DATE_EPOCH) > $(distdir)/.tarball-timestamp gen-ChangeLog: - $(AM_V_GEN)if test -e .git; then \ - export LC_ALL=en_US.UTF-8; \ - export TZ=UTC0; \ - $(top_srcdir)/build-aux/gitlog-to-changelog \ - > $(distdir)/ChangeLog.tmp; \ - rm -f $(distdir)/ChangeLog; \ - mv $(distdir)/ChangeLog.tmp $(distdir)/ChangeLog; \ - fi + $(AM_V_GEN)set -e; \ + export LC_ALL=en_US.UTF-8; \ + export TZ=UTC0; \ + $(top_srcdir)/build-aux/gitlog-to-changelog \ + > $(distdir)/ChangeLog.tmp; \ + rm -f $(distdir)/ChangeLog; \ + mv $(distdir)/ChangeLog.tmp $(distdir)/ChangeLog; gen-AUTHORS: - $(AM_V_GEN)if test -e .git; then \ + $(AM_V_GEN)set -e; \ rm -f "$(distdir)/AUTHORS"; \ export LC_ALL=en_US.UTF-8; \ export TZ=UTC0; \ $(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/generate-authors.scm" \ - "$(top_srcdir)" "$(distdir)/AUTHORS"; \ - fi + "$(top_srcdir)" "$(distdir)/AUTHORS"; # Like 'dist', but regenerate 'configure' so we get an up-to-date # 'PACKAGE_VERSION' string. (In Gnulib, 'GNUmakefile' has a special trick to -- 2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 09:54:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 05:54:07 2024
Received: from localhost ([127.0.0.1]:45795 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rx1zQ-0005Bv-0P
for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 05:54:07 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:53772)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rx1zK-00059u-8M
for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 05:54:01 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rx1z0-0006ef-HN; Wed, 17 Apr 2024 05:53:38 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to:
references; bh=a03hpG7k3BYCqEDy9al9bV8lpYNkshALcvo0Cj+1egg=; b=V9cdMbqilkhtnC
HCaogasUIMOyediD74QsxMUrH+Yd3Wt27YgkbxeZw8cgxrezULH1VLKPPzDxxS+NwZA9VMUsqs2mM
zaGxxzxgBx4wGXDlBgV3PRzFROOIfK7AEt/XCzU/A9XONetPTPg7G5q6zT2OoP3DPb51LnPv6ekvO
ITXegKzJXJ4minbN3VEKkiST2UdULbtVCzYGnzGRBgxavZKPRpQZ+4inmBqZJuOj+/amDHdl5gm+G
tb7FNPVe6yU4hc+D2jhINxWNij0e3CQaGAqU7IuDJmvzJyvTmeBCcDa5U/Lf/9rL6OPjCxE3wWfaK
k8Uj7uPafSuMHjgHT8yA==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH v3 0/4] Reproducible `make dist' tarball: Avoid override
stamp-N warnings.
Date: Wed, 17 Apr 2024 11:53:27 +0200
Message-ID: <cover.1713340673.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Changes in V3
* Resurrect/cater for running `make dist' from tarball by not removing
any Autotools' caches,
* Distribute build-aux/mdate-from-git.scm to support running ./bootstrap
from tarball.
Doing the latter will still generate an unversioned `guix-.tar.gz' tarball,
just like before, as we use Autotools' git-version-gen in configure.ac that
doesn't cater for this scenario, AFAIU.
Janneke Nieuwenhuizen (4):
maint: Cater for running `make dist' from tarball.
maint: Generate doc/version[-LANG].texi using `mdate-from-git.scm'.
Revert "maint: Generate 'doc/version-LANG.texi' reproducibly."
Revert "maint: Generate 'doc/version.texi' reproducibly."
Makefile.am | 62 +++++++++++++++-----------
bootstrap | 8 +++-
build-aux/mdate-from-git.scm | 86 ++++++++++++++++++++++++++++++++++++
doc/local.mk | 32 --------------
4 files changed, 130 insertions(+), 58 deletions(-)
create mode 100755 build-aux/mdate-from-git.scm
base-commit: b47ae1ecc43baaf726701ab2d2f810ecfaa75428
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 08:10:48 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 17 04:10:48 2024 Received: from localhost ([127.0.0.1]:45653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rx0NS-00041W-G2 for submit <at> debbugs.gnu.org; Wed, 17 Apr 2024 04:10:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rx0NO-000404-5i for 70380 <at> debbugs.gnu.org; Wed, 17 Apr 2024 04:10:44 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rx0N4-0005eA-N6; Wed, 17 Apr 2024 04:10:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=l7MXy0b+DvKMVR7ug/mDowPRFP1nAJbqve2KuTsTU54=; b=kOg7Kjg6zfKuFtSGYNcB EaAqiStExq6LYCzuY/m06ZFinup4XuzU43Tv2NlpOwiiYu3amz2b1zB6O0wIYpbYGno8mJ9/+VBQJ pKGsQghsSvhXlARzLRptfThLnmB3SAyoGf8V+XB8HlHOrAo9KA+sNTuE+OriCHt0hUBF8FOj0F1e6 fHCYmG/6d6XgToaJUMcB7UxxdLGmstGSe3VWFWExEFCeRBn03/17apbabNUJ8XxKukvrjTuKwGlzI YOQHPalR+X2NLi0Pa+sZTGs5AQoHgNQR6618d9shVkqnicQ9dYnj1W0rBidcvrfyQ7HG7zQg+nR8K yMQP68LHle46sA==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> Subject: Re: [bug#70380] [PATCH v2 0/3] Reproducible `make dist' tarball: Avoid override stamp-N warnings. In-Reply-To: <8734rlkb9n.fsf@HIDDEN> (pelzflorian@HIDDEN's message of "Tue, 16 Apr 2024 09:38:28 +0200") Organization: AvatarAcademy.nl References: <cover.1713087991.git.janneke@HIDDEN> <cover.1713190364.git.janneke@HIDDEN> <877cgxkbi7.fsf@HIDDEN> <8734rlkb9n.fsf@HIDDEN> X-Url: http://AvatarAcademy.nl Date: Wed, 17 Apr 2024 10:10:08 +0200 Message-ID: <874jc0z9y7.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70380 Cc: 70380 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) pelzflorian (Florian Pelz) writes: Hi! > I=E2=80=99ve reported wrongly, Ah, phew. And thanks for testing! > "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> writes: >> make[2]: *** No rule to make target 'build-aux/mdate-sh', needed by 'dis= tdir-am'. Stop. >> make[2]: Leaving directory '/home/florian/src/guix-1.3.0.57920-346e22' >> make[1]: *** [Makefile:6570: distdir] Error 2 >> make[1]: Leaving directory '/home/florian/src/guix-1.3.0.57920-346e22' >> make: *** [Makefile:6679: dist] Error 2 >> >> >> Alarming is also, when I run =E2=80=9Cmake -j6=E2=80=9D from a generated= tarball, it >> fails. I had not tested this previously but should have. Arrgh. The >> error message about an error at Makefile:6301 gives me no clue. =E2=80= =9Cmake=E2=80=9D >> runs almost through, though, except for the above error. > > It was not the above mdate-sh error. The error running make from a > tarball is > > [100%] GUILEC guix/scripts/time-machine.go > [100%] GUILEC guix/scripts/copy.go > [100%] GUILEC guix/scripts/discover.go > [100%] GUILEC guix/scripts/offload.go > HELP2MAN doc/guix-daemon.1 > make[2]: *** No rule to make target 'etc/git/pre-push', needed by '.git/h= ooks/pre-push'. Stop. > make[2]: Leaving directory '/home/florian/guix-1.3.0.57920-346e22' > make[1]: *** [Makefile:6301: all-recursive] Error 1 > make[1]: Leaving directory '/home/florian/guix-1.3.0.57920-346e22' > make: *** [Makefile:4368: all] Error 2 Okay, this reproduces. I didn't think about this scenario test this at all... V3 comes with an extra commit to cater for this. Greetings, Janneke --=20 Janneke Nieuwenhuizen <janneke@HIDDEN> | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.Received: (at 70380) by debbugs.gnu.org; 16 Apr 2024 07:38:52 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 16 03:38:52 2024 Received: from localhost ([127.0.0.1]:42227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rwdP0-0002Zv-Fd for submit <at> debbugs.gnu.org; Tue, 16 Apr 2024 03:38:52 -0400 Received: from relay.yourmailgateway.de ([46.38.247.119]:43895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pelzflorian@HIDDEN>) id 1rwdOx-0002ZF-Ry for 70380 <at> debbugs.gnu.org; Tue, 16 Apr 2024 03:38:48 -0400 Received: from mors-relay-8404.netcup.net (localhost [127.0.0.1]) by mors-relay-8404.netcup.net (Postfix) with ESMTPS id 4VJbWG4gBGz7ysr; Tue, 16 Apr 2024 09:38:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1713253114; bh=AnekwnBuLFJPN87UoM6EYhj79KI9dG5Iod4Gi7U67s4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=eH7J8bXUXrZQRk/MMMHe75J4CpCd1AlBLzhOeExypjPZXAm+IkRecleFpziIpD5AL 1yFi3lpVqMWejK3tAZqMlr39sfvht+8Om42Yv37YwTWN8GRbD6NoyR2vQPb03N+aIS r6aF/VJuznd2WwSdRMf+MbZQYZoRZ1cY4FCIZjHOXxgp1e9gPSCtrAeZ1TuaYSia7f n8VXzevRRvsZa5KSTTQZx57Z9VeP/DcOGYxctSjmmaB85x7uSObpURoSqwlJPZ67lj PoxjkS4e59rZeBIYTJReBKBwT2amjssA+wfUcS+HkF4cMB0D5nUTRryu8KLEP/PorR b7IKM7EsO2gTw== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8404.netcup.net (Postfix) with ESMTPS id 4VJbWG4Hxkz4yLL; Tue, 16 Apr 2024 09:38:34 +0200 (CEST) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4VJbWG2978z8sbC; Tue, 16 Apr 2024 09:38:34 +0200 (CEST) Received: from florianrock64 (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id EC8C4832B1; Tue, 16 Apr 2024 09:38:28 +0200 (CEST) From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: [bug#70380] [PATCH v2 0/3] Reproducible `make dist' tarball: Avoid override stamp-N warnings. In-Reply-To: <877cgxkbi7.fsf@HIDDEN> (pelzflorian@HIDDEN's message of "Tue, 16 Apr 2024 09:33:20 +0200") References: <cover.1713087991.git.janneke@HIDDEN> <cover.1713190364.git.janneke@HIDDEN> <877cgxkbi7.fsf@HIDDEN> Date: Tue, 16 Apr 2024 09:38:28 +0200 Message-ID: <8734rlkb9n.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: EC8C4832B1 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: JaNdJjN9cTKzCmLei5yVhvjbxf1IaPX4bdVSWq46acf8uM6Xqe+upDWs X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70380 Cc: 70380 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) I=E2=80=99ve reported wrongly, "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> writes: > make[2]: *** No rule to make target 'build-aux/mdate-sh', needed by 'dist= dir-am'. Stop. > make[2]: Leaving directory '/home/florian/src/guix-1.3.0.57920-346e22' > make[1]: *** [Makefile:6570: distdir] Error 2 > make[1]: Leaving directory '/home/florian/src/guix-1.3.0.57920-346e22' > make: *** [Makefile:6679: dist] Error 2 > > > Alarming is also, when I run =E2=80=9Cmake -j6=E2=80=9D from a generated = tarball, it > fails. I had not tested this previously but should have. Arrgh. The > error message about an error at Makefile:6301 gives me no clue. =E2=80= =9Cmake=E2=80=9D > runs almost through, though, except for the above error. It was not the above mdate-sh error. The error running make from a tarball is [100%] GUILEC guix/scripts/time-machine.go [100%] GUILEC guix/scripts/copy.go [100%] GUILEC guix/scripts/discover.go [100%] GUILEC guix/scripts/offload.go HELP2MAN doc/guix-daemon.1 make[2]: *** No rule to make target 'etc/git/pre-push', needed by '.git/hoo= ks/pre-push'. Stop. make[2]: Leaving directory '/home/florian/guix-1.3.0.57920-346e22' make[1]: *** [Makefile:6301: all-recursive] Error 1 make[1]: Leaving directory '/home/florian/guix-1.3.0.57920-346e22' make: *** [Makefile:4368: all] Error 2 Regards, Florian
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.Received: (at 70380) by debbugs.gnu.org; 16 Apr 2024 07:33:48 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 16 03:33:47 2024 Received: from localhost ([127.0.0.1]:42191 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rwdK6-0001ta-Kw for submit <at> debbugs.gnu.org; Tue, 16 Apr 2024 03:33:47 -0400 Received: from relay.yourmailgateway.de ([185.244.194.184]:50871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pelzflorian@HIDDEN>) id 1rwdK0-0001sT-Jk for 70380 <at> debbugs.gnu.org; Tue, 16 Apr 2024 03:33:44 -0400 Received: from relay01-mors.netcup.net (localhost [127.0.0.1]) by relay01-mors.netcup.net (Postfix) with ESMTPS id 4VJbPL5hrfz90Sq; Tue, 16 Apr 2024 09:33:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1713252806; bh=pdEm0RU5ylkHXTo48haLUdCbTrd+KH1nPORO+l/GO4k=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=LIPJDAhjS7tYa/x0QxFqhOnTt9WYIt7VrlX5QytUwgB0e8n/qvNT6lbHyZyB3BrT4 Ei8l05rG+TWY4hs0UDMetB4bdPK25tiAM7PaXEKKmUNrThYyK6C+iOxLcu4GkcK2e6 TIj5OSb2ONmA4rCFrdzKr5UXOR8De0oiC0dLeFrIm6z9Mhxq/dIw+2NCJa6L8qXlQC B6QF3co9DQUyN3GBFknY9/MUI0YDfHoGwqPuMsHCSn41eUXRucGP+wgf1VLTZCKMhG dXMZAEYpv6yDkVvMz6dOVSKMaTk1j7g7muksfW5SvaxMm4ksiyVgdSre4HmmfRlg7l suYHEwFPy9IFQ== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by relay01-mors.netcup.net (Postfix) with ESMTPS id 4VJbPL51w5z7yny; Tue, 16 Apr 2024 09:33:26 +0200 (CEST) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4VJbPL39vQz8sb3; Tue, 16 Apr 2024 09:33:26 +0200 (CEST) Received: from florianrock64 (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id CEE8782F25; Tue, 16 Apr 2024 09:33:20 +0200 (CEST) From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: [bug#70380] [PATCH v2 0/3] Reproducible `make dist' tarball: Avoid override stamp-N warnings. In-Reply-To: <cover.1713190364.git.janneke@HIDDEN> (Janneke Nieuwenhuizen's message of "Mon, 15 Apr 2024 16:27:45 +0200") References: <cover.1713087991.git.janneke@HIDDEN> <cover.1713190364.git.janneke@HIDDEN> Date: Tue, 16 Apr 2024 09:33:20 +0200 Message-ID: <877cgxkbi7.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: CEE8782F25 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: U7vFikSsBIzORlte3LtJgMH1Hc2PMUyXjk5fBa/gzj++7jSKG4wwg8My X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70380 Cc: 70380 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi again, Jan. Janneke Nieuwenhuizen <janneke@HIDDEN> writes: > V2 fixes embarrasing typos in 1/3 that should have prevented for this pat= ch to > build a reproducible tarball at all. Most probably I only tested a previ= ous > version where mdate-from-git was a plain shell script. > > Janneke Nieuwenhuizen (3): > maint: Generate doc/version[-LANG].texi using `mdate-from-git.scm'. > Revert "maint: Generate 'doc/version-LANG.texi' reproducibly." > Revert "maint: Generate 'doc/version.texi' reproducibly." It all looked great when reading, but sorry to say, there are errors. I run =E2=80=9Cmake dist=E2=80=9D from a =E2=80=9Cmake dist=E2=80=9D-generate= d tarball and get (with LC_ALL=3DC): HELP2MAN doc/guix-style.1 HELP2MAN doc/guix-system.1 HELP2MAN doc/guix-time-machine.1 HELP2MAN doc/guix-weather.1 HELP2MAN doc/guix.1 CXX nix/nix-daemon/guix_daemon-guix-daemon.o CXXLD guix-daemon HELP2MAN doc/guix-daemon.1 make[2]: *** No rule to make target 'build-aux/mdate-sh', needed by 'distdi= r-am'. Stop. make[2]: Leaving directory '/home/florian/src/guix-1.3.0.57920-346e22' make[1]: *** [Makefile:6570: distdir] Error 2 make[1]: Leaving directory '/home/florian/src/guix-1.3.0.57920-346e22' make: *** [Makefile:6679: dist] Error 2 Alarming is also, when I run =E2=80=9Cmake -j6=E2=80=9D from a generated ta= rball, it fails. I had not tested this previously but should have. Arrgh. The error message about an error at Makefile:6301 gives me no clue. =E2=80=9Cm= ake=E2=80=9D runs almost through, though, except for the above error. Strange. Does it work for you? Something else less relevant, when running =E2=80=9C./bootstrap && ./config= ure --localstatedir=3D/var --sysconfdir=3D/etc=E2=80=9D from a generated tarbal= l, it prints many harmless errors: Copying file m4/visibility.m4 Copying file m4/wchar_t.m4 Copying file m4/wint_t.m4 Copying file m4/xsize.m4 Copying file po/guix/Makevars.template Copying file po/packages/Makevars.template autoreconf: running: aclocal --force -I m4 sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden autoreconf: configure.ac: tracing sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory autoreconf: configure.ac: not using Libtool autoreconf: running: /gnu/store/4q6xf35c45c2a7xrw8brdgqn20cgb4bx-autoconf-2= .69/bin/autoconf --force sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory autoreconf: running: /gnu/store/4q6xf35c45c2a7xrw8brdgqn20cgb4bx-autoconf-2= .69/bin/autoheader --force sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden sh: line 1: build-aux/git-version-gen: Datei oder Verzeichnis nicht gefunden autoreconf: running: automake --add-missing --copy --force-missing sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory sh: line 1: build-aux/git-version-gen: No such file or directory Makefile.am:922: warning: AM_GNU_GETTEXT used but 'po' not in SUBDIRS autoreconf: Leaving directory `.' + chmod +w build-aux/mdate-sh + rm -f build-aux/mdate-sh + ln -s mdate-from-git.scm build-aux/mdate-sh checking for a BSD-compatible install... /gnu/store/gfcvx5bbybpvc5dbq32dra0= 4ncrvdhn9-profile/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /gnu/store/gfcvx5bbybpvc5dbq32dra04n= crvdhn9-profile/bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes (=E2=80=9CDatei oder Verzeichnis nicht gefunden=E2=80=9D is German for =E2= =80=9CNo such file or directory=E2=80=9D, so it sometimes gets translated and sometimes not. Pos= sibly it is related to your patches, possibly not; I have not tested without patches.) Regards, Florian
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 15 Apr 2024 14:28:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 15 10:28:36 2024
Received: from localhost ([127.0.0.1]:37575 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rwNJy-0007Uw-Q4
for submit <at> debbugs.gnu.org; Mon, 15 Apr 2024 10:28:36 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:46606)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rwNJk-0007Rg-6M
for 70380 <at> debbugs.gnu.org; Mon, 15 Apr 2024 10:28:24 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rwNJT-0005l6-56; Mon, 15 Apr 2024 10:28:03 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=8AejkK/u0zFIXXzdUR6ZcSPHi28dhCnV3kGEsT1Cpwc=; b=J0+jKT/OH+B2eSgMmw9D
K9vJw+UwB95rBCc4Qi2L4JmxTXG50xju05uzQ9+6/zFRdM1APdlq6YE6n24QNh50i+WNYxkOcy506
X5ckpeSFTaRBRqLIYAzL+HarNdn8gye5TM6xQ9e7clp5WeBQ/i0FJ3z/xX579o4SgD6SnmgM/Zf8l
Q2Wgxo6bZtckg6zs356G4WU30kf7GQiDoWKhXDbgBH58Wv53IHNuWJPS6aYOQqPQXysbIKwuya6Ta
uuGS+aFndl7HMMxb2HRGThwsaPWoB1jDAh6w8/CHZrjMg7ACqnTN9nJhM5SABFH2E/jIVNJ2gmbMh
CAlOwHsXcVzBnA==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH v2 2/3] Revert "maint: Generate 'doc/version-LANG.texi'
reproducibly."
Date: Mon, 15 Apr 2024 16:27:47 +0200
Message-ID: <70a03da06dc3a247d0b91807d0f3b9c160632dda.1713190364.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713190364.git.janneke@HIDDEN>
References: <cover.1713190364.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Using `build-aux/mdate-from-git.scm' makes this no longer necessary.
This reverts commit 0e4ead187d83a958ca0deb54857c04967e84d68b.
Change-Id: I9177828f90fa7f7e256bc72fdff35a2fab355780
---
doc/local.mk | 40 +++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 23 deletions(-)
diff --git a/doc/local.mk b/doc/local.mk
index 130f40ece9..77d48902b6 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -260,32 +260,26 @@ endif
# Reproducible tarball
-# Define a rule to build `version[LANG].texi' reproducibly using metadata from
-# Git rather than using metadata from the filesystem.
-define version.texi-from-git
-$(srcdir)/doc/stamp-$(1): $(srcdir)/$(2) $(top_srcdir)/configure
- $$(AM_V_GEN)set -e; \
- export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \
- export TZ=UTC0; \
- timestamp="$$$$(git log --pretty=format:%ct -n1 -- "$$<" \
- 2>/dev/null \
- || echo $$(SOURCE_DATE_EPOCH))" \
- dmy=$$$$(date --date="@$$$$timestamp" "+%-d %B %Y"); \
- my=$$$$(date --date="@$$$$timestamp" "+%B %Y"); \
- { echo "@set UPDATED $$$$dmy"; \
- echo "@set UPDATED-MONTH $$$$my"; \
- echo "@set EDITION $$$(VERSION)"; \
- echo "@set VERSION $$$(VERSION)"; } > "$$@-t"; \
- mv "$$@-t" "$$@"; \
- cp -p "$$@" "$$(srcdir)/doc/version$(3).texi"
-endef
-
-# Generate rules for stamp-vti and stamp-N that create version.texi and
-# version-LANG.texi to override the Autotools versions that use timestamps
-# embedded in the file-system. These are expected to generate warnings:
+# Generate 'version.texi' reproducibly using metadata from Git rather than
+# using metadata from the filesystem. This is expected to generate warnings:
#
# Makefile:7376: warning: overriding recipe for target 'doc/stamp-vti'
# Makefile:5098: warning: ignoring old recipe for target 'doc/stamp-vti'
+$(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure
+ $$(AM_V_GEN)set -e; \
+ export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \
+ export TZ=UTC0; \
+ timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \
+ || echo $(SOURCE_DATE_EPOCH)) \
+ dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \
+ my=$$(date --date="@$$timestamp" "+%B %Y"); \
+ { echo "@set UPDATED $$dmy"; \
+ echo "@set UPDATED-MONTH $$my"; \
+ echo "@set EDITION $(VERSION)"; \
+ echo "@set VERSION $(VERSION)"; } > $@-t; \
+ mv $@-t $@; \
+ cp $@ $(srcdir)/doc/version.texi
+
i:=0
$(eval $(call version.texi-from-git,vti,doc/guix.texi,))
$(foreach lang, $(MANUAL_LANGUAGES), \
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 15 Apr 2024 14:28:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 15 10:28:34 2024
Received: from localhost ([127.0.0.1]:37573 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rwNJx-0007Uj-K9
for submit <at> debbugs.gnu.org; Mon, 15 Apr 2024 10:28:34 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:46614)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rwNJl-0007S2-Qq
for 70380 <at> debbugs.gnu.org; Mon, 15 Apr 2024 10:28:24 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rwNJU-0005ly-PO; Mon, 15 Apr 2024 10:28:04 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=/IgthRV+DK3fnFHAK0ShArj105AC7+Zsb6GJNQqs/Q0=; b=K1/nhdUCk91Bch9nVuR1
0mSRNVvWl+sgoZHVeOjyMEk8wTyQRRfLW0S05H8Ds2za1EKRn3hINbMnROofxWBOaR43jZ5h3LOKk
4pDQJXwwxP0T88UzGDNTiy2P/RLvKhJMtIjpU92ai2ECfpCe5oDruz6jHj2QqwV1I5/QOWHsa16wO
FdUCnGLw9IhehbIWcwGd+GDK3G0t+mgj/7u5iZTenzplvWhc/RHsw0zgbvZhutHkUCFX5WcKUok9h
oqAphV15BEEWdcNR8AeGfN39ZzeIJ9EDRUPLZvOIDkBHq6Z5wa+n6SWILjOlc7yjac6lMANFyNKzj
7u5IF19Tz/4kng==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH v2 3/3] Revert "maint: Generate 'doc/version.texi'
reproducibly."
Date: Mon, 15 Apr 2024 16:27:48 +0200
Message-ID: <da11f794cf3449860055cd45a4550c7922aaf76f.1713190364.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713190364.git.janneke@HIDDEN>
References: <cover.1713190364.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Using `build-aux/mdate-from-git.scm' makes this no longer necessary.
This reverts commit e73ea7bd64f64709c71f89dfb111cf3e8ada3771.
Change-Id: I29d1e36b13d255e5a65b7348e7ae4f2b2c24a518
---
doc/local.mk | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/doc/local.mk b/doc/local.mk
index 77d48902b6..1d94e3c758 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -260,32 +260,6 @@ endif
# Reproducible tarball
-# Generate 'version.texi' reproducibly using metadata from Git rather than
-# using metadata from the filesystem. This is expected to generate warnings:
-#
-# Makefile:7376: warning: overriding recipe for target 'doc/stamp-vti'
-# Makefile:5098: warning: ignoring old recipe for target 'doc/stamp-vti'
-$(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure
- $$(AM_V_GEN)set -e; \
- export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \
- export TZ=UTC0; \
- timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \
- || echo $(SOURCE_DATE_EPOCH)) \
- dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \
- my=$$(date --date="@$$timestamp" "+%B %Y"); \
- { echo "@set UPDATED $$dmy"; \
- echo "@set UPDATED-MONTH $$my"; \
- echo "@set EDITION $(VERSION)"; \
- echo "@set VERSION $(VERSION)"; } > $@-t; \
- mv $@-t $@; \
- cp $@ $(srcdir)/doc/version.texi
-
-i:=0
-$(eval $(call version.texi-from-git,vti,doc/guix.texi,))
-$(foreach lang, $(MANUAL_LANGUAGES), \
- $(eval i=$(shell echo $$(($(i)+1)))) \
- $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).po,-$(lang))))
-
DIST_CONFIGURE_FLAGS = \
--localstatedir=/var \
--sysconfdir=/etc
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 15 Apr 2024 14:28:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 15 10:28:24 2024
Received: from localhost ([127.0.0.1]:37568 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rwNJl-0007Ss-L4
for submit <at> debbugs.gnu.org; Mon, 15 Apr 2024 10:28:24 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:46596)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rwNJi-0007RW-Q1
for 70380 <at> debbugs.gnu.org; Mon, 15 Apr 2024 10:28:19 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rwNJR-0005kr-MI; Mon, 15 Apr 2024 10:28:01 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=5wULBzkNZvX00xa+Hcwt7NtQ2vYVcJb44kD9QaOq2sU=; b=cxXtx3hOqUNNl5LayOMz
l0rEUjiLPVL/X3VEeYtk7oNBE3wx2shSHc9ZLDGCF53WcGE7WvoaM+0SsR0cXm4wvpIdGoSfjAXP/
z0uEGTFcKpsWrEfQ3qvVfwxHH+m0ovAP4/y1VgdUIXI1uB3LZ5IHUWO8iCX9nbTovZoN9FeGWhGhV
Z4yse90dC3cQx6qA7Y3TRdVpNB+jtW49yCuoTjDjck9UqmzDzFFAra+zSirBe3xEfpb0fMDld44v1
yrGA7TVK3puzOmMvO4/5T09RVaasQ1INIHDiR65Na5xjlR1jwo1w0KXDGZNm/3wWylyDjGL8mwjGS
INhtVHtyoyltmw==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH v2 1/3] maint: Generate doc/version[-LANG].texi using
`mdate-from-git.scm'.
Date: Mon, 15 Apr 2024 16:27:46 +0200
Message-ID: <5fab9ccaca83003bfcf79baa00dd23cc4179b3ae.1713190364.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713190364.git.janneke@HIDDEN>
References: <cover.1713190364.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
This replaces Automake's `build-aux/mdate-sh' with our own
`build-aux/mdate-from-git.scm' to use reproducible timestamps from Git
instead.
* build-aux/mdate-from-git.scm: New script.
* bootstrap: Use it to replace build-aux/mdate-sh.
Change-Id: I17d0a7de9ffea397129c0db1728f86e28a4e245f
---
bootstrap | 8 +++-
build-aux/mdate-from-git.scm | 86 ++++++++++++++++++++++++++++++++++++
2 files changed, 93 insertions(+), 1 deletion(-)
create mode 100755 build-aux/mdate-from-git.scm
diff --git a/bootstrap b/bootstrap
index de024aeaa5..5bf83175e5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -24,4 +24,10 @@ for lang in ${langs}; do
fi
done
-exec autoreconf -vfi
+autoreconf -vfi
+
+# Replace Automake's build-aux/mdate-sh with build-aux/mdate-from-git, our
+# own, reproducible version.
+chmod +w build-aux/mdate-sh
+rm -f build-aux/mdate-sh
+ln -s mdate-from-git.scm build-aux/mdate-sh
diff --git a/build-aux/mdate-from-git.scm b/build-aux/mdate-from-git.scm
new file mode 100755
index 0000000000..abe7e97f32
--- /dev/null
+++ b/build-aux/mdate-from-git.scm
@@ -0,0 +1,86 @@
+#! /bin/sh
+# -*-scheme-*-
+export LANG=C LANGUAGE=C LC_TIME=C
+export TZ=UTC0
+exec guile --no-auto-compile -L $srcdir -C $srcdir -e '(mdate-from-git)' -s "$0" "$@"
+!#
+
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; This program is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;;; Commentary:
+;;;
+;;; Usage: mdate-from-git.scm FILE
+;;;
+;;; This script is compatible with Automake's `mdate-sh' but uses the timestamp
+;;; from Git instead of from the file system. Also, it can be appended to
+;;; mdate-sh.
+
+;;; As a special exception for Guix, it caters for doc/guix.LANG.texi files that
+;;; are not stored in Git, by using po/doc/guix-manual.LANG.po for the Git
+;;; timestamp. Test doing something like:
+;;;
+;;; build-aux/mdate-from-git.scm doc/guix.de.texi
+;;;
+;;;; Code:
+
+(define-module (mdate-from-git)
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 popen)
+ #:use-module (ice-9 rdelim)
+ #:use-module (ice-9 regex)
+ #:export (main))
+
+(define (pipe-command command)
+ (let* ((port (apply open-pipe* OPEN_READ command))
+ (output (read-string port)))
+ (close-port port)
+ output))
+
+(define (guix.LANG.texi->guix-manual.LANG.po file-name)
+ "Translated manuals doc/guix.LANG.texi are not tracked in Git and are
+generated from po/doc/guix-manual.LANG.po. For such an untraced .TEXI file,
+return its .PO counterpart."
+ (let ((m (string-match "doc/guix.([^.]+).texi" file-name)))
+ (if (not m) file-name
+ (let ((lang (match:substring m 1)))
+ (format #f "po/doc/guix-manual.~a.po" lang)))))
+
+
+;;;
+;;; Entry point.
+;;;
+(define (main args)
+ (match args
+ ((script file-name)
+ (let* ((command `("git" "ls-files" "--error-unmatch" "--" ,file-name))
+ (tracked? (zero? (with-error-to-port (%make-void-port "w")
+ (lambda _ (apply system* command)))))
+ (file-name (if tracked? file-name
+ (guix.LANG.texi->guix-manual.LANG.po file-name)))
+ (command `("git" "log" "--pretty=format:%ct" "-n1" "--" ,file-name))
+ (timestamp (pipe-command command))
+ (source-date-epoch (or (getenv "SOURCE_DATE_EPOCH") "1"))
+ (timestamp (if (string-null? timestamp) source-date-epoch
+ timestamp))
+ (time (gmtime (string->number timestamp)))
+ (d-m-y (strftime "%-d %B %Y" time)))
+ (display d-m-y)))
+ (_
+ (format (current-error-port) "Usage: mdate-from-git.scm FILE\n")
+ (exit 2))))
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.Received: (at 70380) by debbugs.gnu.org; 15 Apr 2024 14:28:22 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 15 10:28:21 2024 Received: from localhost ([127.0.0.1]:37564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rwNJj-0007SU-UD for submit <at> debbugs.gnu.org; Mon, 15 Apr 2024 10:28:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rwNJg-0007R6-HB for 70380 <at> debbugs.gnu.org; Mon, 15 Apr 2024 10:28:18 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rwNJP-0005kb-FG; Mon, 15 Apr 2024 10:27:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=1cSj4u/rcnPLr0OaDzotGhyGRPL5LTQDATm89iRI5zo=; b=O2BCA7fPAR1Zvx PFyNW+8Ridqa7piM2IRReUacUM4hXKNnpeQ539kJDTx0LST7lkeKcuILlS0psNMdrZyDrOpiF+BHE oWMWMffrvOY5Ko0JFujuQe2SyjSelbRrSmm98dGjrbBa2x/HEwW+WY8YolOE9IfnooRR5xbWPFBhF K7+w4Qc6LfqxWXdWpVjjKorZ0BQNI7FYebLKLzwzn2CnvrHRTvKfaKapA8KA/8gLqupUMtqewsdC1 KsL7X/SExr8JNhU4slt+56coPGoXCCCHBDUxkmHoJuLpOQpLgkvtcbKmRLtrlqQi5aZMrw5m3C0Ae 6oyMFrOtm8wheLBdTPKw==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70380 <at> debbugs.gnu.org Subject: [PATCH v2 0/3] Reproducible `make dist' tarball: Avoid override stamp-N warnings. Date: Mon, 15 Apr 2024 16:27:45 +0200 Message-ID: <cover.1713190364.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70380 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) V2 fixes embarrasing typos in 1/3 that should have prevented for this patch to build a reproducible tarball at all. Most probably I only tested a previous version where mdate-from-git was a plain shell script. Janneke Nieuwenhuizen (3): maint: Generate doc/version[-LANG].texi using `mdate-from-git.scm'. Revert "maint: Generate 'doc/version-LANG.texi' reproducibly." Revert "maint: Generate 'doc/version.texi' reproducibly." bootstrap | 8 +++- build-aux/mdate-from-git.scm | 86 ++++++++++++++++++++++++++++++++++++ doc/local.mk | 32 -------------- 3 files changed, 93 insertions(+), 33 deletions(-) create mode 100755 build-aux/mdate-from-git.scm base-commit: e5dda412c2e28fb65a549824f492895e72c33813 -- 2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 14 Apr 2024 10:01:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 14 06:01:21 2024
Received: from localhost ([127.0.0.1]:34359 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rvwfp-0003LR-0x
for submit <at> debbugs.gnu.org; Sun, 14 Apr 2024 06:01:21 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:58222)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rvwej-00038S-12
for 70380 <at> debbugs.gnu.org; Sun, 14 Apr 2024 06:00:25 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rvweS-0004KN-MB; Sun, 14 Apr 2024 05:59:56 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=L5ybXSswu+QWxiG5D/tGEs+VFX1LO4pEwrw/Xxa0wF4=; b=bGDVAJnXhFBka9P7Boq9
Ab4TZqJfy80F7eeizU7TDhQGjJKJ2qHHWZZQQYYJldS29jrCDO22OcKAdvAYLYUtS76Ucl2VV0ma1
QAOg0u0mxWPF/FgsOLUA8FdtuWn+xydz9kXn6NtDBdII96JBz2EcIeqHx9APIhdtvmg/w3aveCsAW
rPBXelWbRRhXBWgT4DfIZwGKP86/DkmXFBpiuFnWHUCWoOh9fNDbg0ojw8uvYSNpq8n1ya4hoqBqH
FU1ah2qo+qwyl5W6Hu7XwZO6nn/fUU3yvkOsp4qFbAc5BOx6bKa6zmR8+90RczgV7Cl6B5KcbHj1t
0wleWfoV93NbUw==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH 2/3] Revert "maint: Generate 'doc/version-LANG.texi'
reproducibly."
Date: Sun, 14 Apr 2024 11:59:40 +0200
Message-ID: <eeeddd0065ab6c512c9911f61b355beed36d4531.1713087991.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713087991.git.janneke@HIDDEN>
References: <cover.1713087991.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Using `build-aux/mdate-from-git' makes this no longer necessary.
This reverts commit 0e4ead187d83a958ca0deb54857c04967e84d68b.
Change-Id: I9177828f90fa7f7e256bc72fdff35a2fab355780
---
doc/local.mk | 40 +++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 23 deletions(-)
diff --git a/doc/local.mk b/doc/local.mk
index 130f40ece9..77d48902b6 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -260,32 +260,26 @@ endif
# Reproducible tarball
-# Define a rule to build `version[LANG].texi' reproducibly using metadata from
-# Git rather than using metadata from the filesystem.
-define version.texi-from-git
-$(srcdir)/doc/stamp-$(1): $(srcdir)/$(2) $(top_srcdir)/configure
- $$(AM_V_GEN)set -e; \
- export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \
- export TZ=UTC0; \
- timestamp="$$$$(git log --pretty=format:%ct -n1 -- "$$<" \
- 2>/dev/null \
- || echo $$(SOURCE_DATE_EPOCH))" \
- dmy=$$$$(date --date="@$$$$timestamp" "+%-d %B %Y"); \
- my=$$$$(date --date="@$$$$timestamp" "+%B %Y"); \
- { echo "@set UPDATED $$$$dmy"; \
- echo "@set UPDATED-MONTH $$$$my"; \
- echo "@set EDITION $$$(VERSION)"; \
- echo "@set VERSION $$$(VERSION)"; } > "$$@-t"; \
- mv "$$@-t" "$$@"; \
- cp -p "$$@" "$$(srcdir)/doc/version$(3).texi"
-endef
-
-# Generate rules for stamp-vti and stamp-N that create version.texi and
-# version-LANG.texi to override the Autotools versions that use timestamps
-# embedded in the file-system. These are expected to generate warnings:
+# Generate 'version.texi' reproducibly using metadata from Git rather than
+# using metadata from the filesystem. This is expected to generate warnings:
#
# Makefile:7376: warning: overriding recipe for target 'doc/stamp-vti'
# Makefile:5098: warning: ignoring old recipe for target 'doc/stamp-vti'
+$(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure
+ $$(AM_V_GEN)set -e; \
+ export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \
+ export TZ=UTC0; \
+ timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \
+ || echo $(SOURCE_DATE_EPOCH)) \
+ dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \
+ my=$$(date --date="@$$timestamp" "+%B %Y"); \
+ { echo "@set UPDATED $$dmy"; \
+ echo "@set UPDATED-MONTH $$my"; \
+ echo "@set EDITION $(VERSION)"; \
+ echo "@set VERSION $(VERSION)"; } > $@-t; \
+ mv $@-t $@; \
+ cp $@ $(srcdir)/doc/version.texi
+
i:=0
$(eval $(call version.texi-from-git,vti,doc/guix.texi,))
$(foreach lang, $(MANUAL_LANGUAGES), \
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 14 Apr 2024 10:01:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 14 06:01:11 2024
Received: from localhost ([127.0.0.1]:34355 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rvwfW-0003Gi-0m
for submit <at> debbugs.gnu.org; Sun, 14 Apr 2024 06:01:10 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:58238)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rvwej-00038X-U0
for 70380 <at> debbugs.gnu.org; Sun, 14 Apr 2024 06:00:30 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rvweT-0004Kd-Ij; Sun, 14 Apr 2024 05:59:57 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=DIxPMFqRgHFaIn3UdQ0M3/pJZmyGYpWnuYkwNTHEMvU=; b=Eb8e3W3VQVgEoJ8b+V8w
ZCe+idW0oQ23jAwTC7wIGWx9SguL5mnbRrqDz5gP+OkrGddhJOJkdUzLmkv0wUnUnTr4dqvC6I9EE
fNF6TFNMwNZYJDnVkuZt8Jw7yFpu+VWfePidzjOobGDGGlbYQfBvMg/dqndrVsNOVPBwlTI7Tj3D0
Ufg1JDl7HEVLf1xdATru9b6f2FafW4JI23QLmW1dwjdfSz8uex9cZHZN7b56kShUJBvkvXUs3MjaF
mrAYq1d4IA62tdp04ZzsOe8Q63BXDQfTYi94Rza7ihqn0LWfrD0fAqLAxrv5ywMpPB4YwVWBAeZOe
Bj5o8huARuOPGg==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH 3/3] Revert "maint: Generate 'doc/version.texi' reproducibly."
Date: Sun, 14 Apr 2024 11:59:41 +0200
Message-ID: <4a6c25fc18e70051a753c438fa1f5fa5abb50eb0.1713087991.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713087991.git.janneke@HIDDEN>
References: <cover.1713087991.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Using `build-aux/mdate-from-git' makes this no longer necessary.
This reverts commit e73ea7bd64f64709c71f89dfb111cf3e8ada3771.
Change-Id: I29d1e36b13d255e5a65b7348e7ae4f2b2c24a518
---
doc/local.mk | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/doc/local.mk b/doc/local.mk
index 77d48902b6..1d94e3c758 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -260,32 +260,6 @@ endif
# Reproducible tarball
-# Generate 'version.texi' reproducibly using metadata from Git rather than
-# using metadata from the filesystem. This is expected to generate warnings:
-#
-# Makefile:7376: warning: overriding recipe for target 'doc/stamp-vti'
-# Makefile:5098: warning: ignoring old recipe for target 'doc/stamp-vti'
-$(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure
- $$(AM_V_GEN)set -e; \
- export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \
- export TZ=UTC0; \
- timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \
- || echo $(SOURCE_DATE_EPOCH)) \
- dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \
- my=$$(date --date="@$$timestamp" "+%B %Y"); \
- { echo "@set UPDATED $$dmy"; \
- echo "@set UPDATED-MONTH $$my"; \
- echo "@set EDITION $(VERSION)"; \
- echo "@set VERSION $(VERSION)"; } > $@-t; \
- mv $@-t $@; \
- cp $@ $(srcdir)/doc/version.texi
-
-i:=0
-$(eval $(call version.texi-from-git,vti,doc/guix.texi,))
-$(foreach lang, $(MANUAL_LANGUAGES), \
- $(eval i=$(shell echo $$(($(i)+1)))) \
- $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).po,-$(lang))))
-
DIST_CONFIGURE_FLAGS = \
--localstatedir=/var \
--sysconfdir=/etc
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
Received: (at 70380) by debbugs.gnu.org; 14 Apr 2024 10:00:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 14 06:00:35 2024
Received: from localhost ([127.0.0.1]:34353 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rvwew-0003Ad-LI
for submit <at> debbugs.gnu.org; Sun, 14 Apr 2024 06:00:35 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:58214)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rvweh-00037u-Ui
for 70380 <at> debbugs.gnu.org; Sun, 14 Apr 2024 06:00:22 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rvweR-0004K6-G0; Sun, 14 Apr 2024 05:59:55 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=xF44QmwF5U/azBZ4mA64AhPN8qVhlTNCuF7TKr0mcB0=; b=Z4x0Fih6KxkpqFoHhrWk
UyYLq6a/2rU8Dp4XHUol/U4eLOTFlZ+e6R/QSmRFQ3UygN9J8xbh4JjMk5UISx35H1Lnz4cap7yXN
ibwaQq1bUEIYETcsJxNBPw2yzQA/SBveedSKQnZM68zsTkv1rl+mrE+RzTuoay+kNwmTRK7ah2yzq
DzD169tU0TNWo/n2agFHsdBnJZ0y0ZBApP/97UxNKkFuySYbX7v4QhfQOp44TDIklpGCEDmYD+ftW
+5o7+1Qill1ijeHJUhWb3R2qSWkVDMxzLd6diWy+dVs/mbPjjpwJ4XT8jQsZmIOjzFpdBx5j+n8Eb
9VOMWX9aNUdADg==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70380 <at> debbugs.gnu.org
Subject: [PATCH 1/3] maint: Generate doc/version[-LANG].texi using
`mdate-from-git.scm'.
Date: Sun, 14 Apr 2024 11:59:39 +0200
Message-ID: <bb7d78763d44b6f6b7b38e72f90db8f7208496d1.1713087991.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1713087991.git.janneke@HIDDEN>
References: <cover.1713087991.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70380
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
This replaces Automake's `build-aux/mdate-sh' with our own
`build-aux/mdate-from-git.scm' to use reproducible timestamps from Git
instead.
* build-aux/mdate-from-git.scm: New script.
* bootstrap: Use it to replace build-aux/mdate-sh.
Change-Id: I17d0a7de9ffea397129c0db1728f86e28a4e245f
---
bootstrap | 7 +++
build-aux/mdate-from-git.scm | 88 ++++++++++++++++++++++++++++++++++++
2 files changed, 95 insertions(+)
create mode 100755 build-aux/mdate-from-git.scm
diff --git a/bootstrap b/bootstrap
index de024aeaa5..abd1ed353e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -25,3 +25,10 @@ for lang in ${langs}; do
done
exec autoreconf -vfi
+
+# Replace Automake's build-aux/mdate-sh with build-aux/mdate-from-git, our
+# own, reproducible version.
+chmod +w build-aux/mdate-sh
+rm -f build-aux/mdate-sh
+cp build-aux/mdate-from-git build-aux/mdate-sh
+chmod -wx build-aux/mdate-sh
diff --git a/build-aux/mdate-from-git.scm b/build-aux/mdate-from-git.scm
new file mode 100755
index 0000000000..0abd580460
--- /dev/null
+++ b/build-aux/mdate-from-git.scm
@@ -0,0 +1,88 @@
+#! /bin/sh
+# -*-scheme-*-
+exec guile --no-auto-compile -L $srcdir -C $srcdir -e '(mdate-from-git)' -s "$0" "$@"
+!#
+
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@HIDDEN>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; This program is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;;; Commentary:
+;;;
+;;; Usage: mdate-from-git FILE
+;;;
+;;; This script is compatible with Automake's `mdate-sh' but uses the timestamp
+;;; from Git instead of from the file system. Also, it can be appended to
+;;; mdate-sh.
+
+;;; As a special exception for Guix, it caters for doc/guix.LANG.texi files that
+;;; are not stored in Git, by using po/doc/guix-manual.LANG.po for the Git
+;;; timestamp. Test doing something like:
+;;;
+;;; build-aux/mdate-from-git.scm doc/guix.de.texi
+;;;
+;;;; Code:
+
+(define-module (mdate-from-git)
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 popen)
+ #:use-module (ice-9 rdelim)
+ #:use-module (ice-9 regex)
+ #:export (main))
+
+(define (pipe-command command)
+ (let* ((port (apply open-pipe* OPEN_READ command))
+ (output (read-string port)))
+ (close-port port)
+ output))
+
+(define (guix.LANG.texi->guix-manual.LANG.po file-name)
+ "Translated manuals doc/guix.LANG.texi are not tracked in Git and are
+generated from po/doc/guix-manual.LANG.po. For such an untraced .TEXI file,
+return its .PO counterpart."
+ (let ((m (string-match "doc/guix.([^.]+).texi" file-name)))
+ (if (not m) file-name
+ (let ((lang (match:substring m 1)))
+ (format #f "po/doc/guix-manual.~a.po" lang)))))
+
+
+;;;
+;;; Entry point.
+;;;
+(define (main args)
+ (setenv "LANG" "C")
+ (setenv "LANGUAGE" "C")
+ (setenv "LC_TIME" "C")
+ (setenv "TZ" "UTC0")
+ (match args
+ ((script file-name)
+ (let* ((command `("git" "ls-files" "--error-unmatch" "--" ,file-name))
+ (tracked? (zero? (with-error-to-port (%make-void-port "w")
+ (lambda _ (apply system* command)))))
+ (file-name (if tracked? file-name
+ (guix.LANG.texi->guix-manual.LANG.po file-name)))
+ (command `("git" "log" "--pretty=format:%ct" "-n1" "--" ,file-name))
+ (timestamp (pipe-command command))
+ (source-date-epoch (or (getenv "SOURCE_DATE_EPOCH") "1"))
+ (timestamp (if (string-null? timestamp) source-date-epoch
+ timestamp))
+ (time (gmtime (string->number timestamp)))
+ (d-y-m (strftime "%-d %B %Y" time)))
+ (display d-y-m)))
+ (_
+ (format (current-error-port) "Usage: mdate-from-git.scm FILE\n")
+ (exit 2))))
--
2.41.0
guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 14 Apr 2024 09:57:56 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 14 05:57:54 2024 Received: from localhost ([127.0.0.1]:34343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rvwcO-0002l2-SG for submit <at> debbugs.gnu.org; Sun, 14 Apr 2024 05:57:54 -0400 Received: from lists.gnu.org ([2001:470:142::17]:34746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rvwcC-0002j1-Nf for submit <at> debbugs.gnu.org; Sun, 14 Apr 2024 05:57:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rvwbv-0007Tb-Hl for guix-patches@HIDDEN; Sun, 14 Apr 2024 05:57:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rvwbu-00044Y-QR; Sun, 14 Apr 2024 05:57:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=dDQKtRpc9MgaMdHcUaQIPIJUWfwy27ct5v0qczD7uzo=; b=I73Tdwz8E5eozu SxU8m0yFJX1/AWs7QNheMKbC6+sNpYFuapOHFqXWOAn74Np4vBBbs8EZRThAW0Ku+m/8YHXWxdzOK Qp8zmY88BDvXFmCUwK605zke9MkL/m/KQjHIchttfBvEdID6JC4aIZYu50NM4h2MeaQ+2UkKgoGXJ NfteKb2eVCOQPl4tgTR2D3jUe4CZXLlC3QD61dgmNnLsjzUcvLZwLKzUgSmFhEnCiQzEnTx5xa8Q4 C+z1z0qFdFDwr/ZTuPxYUdtiiVmT2Ez7T9AOGzN65ptV6G1+OqkluDkzkuvFGpE/bCuoYLiYOZBeR /S8sj+12uzAogXSKJX3A==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH 0/3] Reproducible `make dist' tarball: Avoid override stamp-N warnings. Date: Sun, 14 Apr 2024 11:56:36 +0200 Message-ID: <cover.1713087991.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi! Reproducibility is fine and all that but the forteen new make warnings --8<---------------cut here---------------start------------->8--- Makefile:7400: warning: overriding recipe for target 'doc/stamp-vti' Makefile:5117: warning: ignoring old recipe for target 'doc/stamp-vti' Makefile:7401: warning: overriding recipe for target 'doc/stamp-1' Makefile:5182: warning: ignoring old recipe for target 'doc/stamp-1' [..] --8<---------------cut here---------------end--------------->8--- already started to annoy me so much that I found another solution: Overwrite build-aux/mdate-sh with our own, new build-aux/mdate-from-git.scm script. It comes with a bit of a hack: because of how Automake's stamp-N rules are written, the new script needs knowledge about where to get the timestamp for doc/guix.LANG.texi files. WDYT? Greetings, Janneke Janneke Nieuwenhuizen (3): maint: Generate doc/version[-LANG].texi using `mdate-from-git.scm'. Revert "maint: Generate 'doc/version-LANG.texi' reproducibly." Revert "maint: Generate 'doc/version.texi' reproducibly." bootstrap | 7 +++ build-aux/mdate-from-git.scm | 88 ++++++++++++++++++++++++++++++++++++ doc/local.mk | 32 ------------- 3 files changed, 95 insertions(+), 32 deletions(-) create mode 100755 build-aux/mdate-from-git.scm base-commit: e5dda412c2e28fb65a549824f492895e72c33813 -- 2.41.0
Janneke Nieuwenhuizen <janneke@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#70380; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.