From patchwork Mon Apr 15 14:27:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 63048 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6506F27BBEC; Mon, 15 Apr 2024 15:29:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2130B27BBEA for ; Mon, 15 Apr 2024 15:29:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwNKI-0004Ch-Fx; Mon, 15 Apr 2024 10:28:54 -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 ) id 1rwNKG-0004CD-Nb for guix-patches@gnu.org; Mon, 15 Apr 2024 10:28:52 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rwNKG-0005r6-F9 for guix-patches@gnu.org; Mon, 15 Apr 2024 10:28:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwNKS-0007YG-5z for guix-patches@gnu.org; Mon, 15 Apr 2024 10:29:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70380] [PATCH v2 3/3] Revert "maint: Generate 'doc/version.texi' reproducibly." Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2024 14:29:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70380@debbugs.gnu.org Received: via spool by 70380-submit@debbugs.gnu.org id=B70380.171319131528829 (code B ref 70380); Mon, 15 Apr 2024 14:29:04 +0000 Received: (at 70380) by debbugs.gnu.org; 15 Apr 2024 14:28:35 +0000 Received: from localhost ([127.0.0.1]:37573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwNJx-0007Uj-K9 for submit@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 ) id 1rwNJl-0007S2-Qq for 70380@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 ) 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 Date: Mon, 15 Apr 2024 16:27:48 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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