From patchwork Wed Apr 3 19:11:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 62675 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 9DA5B27BBE9; Wed, 3 Apr 2024 20:12:17 +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=unavailable 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 67F5E27BBE2 for ; Wed, 3 Apr 2024 20:12:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rs61k-0007er-DO; Wed, 03 Apr 2024 15:12:04 -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 1rs61g-0007dK-15 for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:00 -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 1rs61f-0001ax-Hj for guix-patches@gnu.org; Wed, 03 Apr 2024 15:11:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rs61j-0001u9-Ug for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70169] [PATCH 1/7] maint: Cater for running `make dist' from a worktree. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 19:12:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70169@debbugs.gnu.org Received: via spool by 70169-submit@debbugs.gnu.org id=B70169.17121715087160 (code B ref 70169); Wed, 03 Apr 2024 19:12:03 +0000 Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:48 +0000 Received: from localhost ([127.0.0.1]:59655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61T-0001rE-Hk for submit@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61S-0001qI-7G for 70169@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:46 -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 1rs61G-0000qR-GC; Wed, 03 Apr 2024 15:11:36 -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=q+rZKnDHKGZdZJcJPA/zMKlTSK8VKTBca9VS8g34lA8=; b=g95b/+Aj28BuZ6j4wyUQ 1CLY4ZAKUnZWwRzNUcLj2tpgvXgrY+XiT1JLMib+YAWz8kXKHzSECnepFXU5cnhhcHtx3Iee5JHQY 7odGz/mf8AaR6f2aUVuT9rdY4ZRfG3vcM0lMOy+nr0BQgc1nhMwtSCaUUaJTJS7fzgGCxII0v2YN0 +54lxek5E02wtRwK4f01F1Nl6y1q0Qh2zeb3g1ySq6GzLvaxpmhNF8QgwejmSYo3N7XcZY8o9VbVO 0PIdbRXN5kur5qIIQQ+jTKAqz/y86Oa70J93xnk4jjK+/TYFJvNL//ws2qT/qy6dsez6B8xROuICK 13BHd1ESE2VoFQ==; From: Janneke Nieuwenhuizen Date: Wed, 3 Apr 2024 21:11:03 +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 * Makefile.am (gen-ChangeLog): Check for existance of `.git', rather than it being a directory. (gen-AUTHORS): Likewise. Change-Id: I1b7f8cc147084c1804deb7be9d36e5eeda2599cb --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1c5688ac13..2b5e145095 100644 --- a/Makefile.am +++ b/Makefile.am @@ -972,7 +972,7 @@ gen-tarball-version: echo $(VERSION) > "$(distdir)/.tarball-version" gen-ChangeLog: - $(AM_V_GEN)if test -d .git; then \ + $(AM_V_GEN)if test -e .git; then \ $(top_srcdir)/build-aux/gitlog-to-changelog \ > $(distdir)/ChangeLog.tmp; \ rm -f $(distdir)/ChangeLog; \ @@ -980,7 +980,7 @@ gen-ChangeLog: fi gen-AUTHORS: - $(AM_V_GEN)if test -d .git; then \ + $(AM_V_GEN)if test -e .git; then \ rm -f "$(distdir)/AUTHORS"; \ $(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/generate-authors.scm" \ From patchwork Wed Apr 3 19:11:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 62676 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 B29DD27BBE9; Wed, 3 Apr 2024 20:12:19 +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=unavailable 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 1527027BBE2 for ; Wed, 3 Apr 2024 20:12:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rs61h-0007dt-QI; Wed, 03 Apr 2024 15:12:01 -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 1rs61g-0007dT-97 for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:00 -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 1rs61g-0001b2-0Q for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rs61k-0001uH-GH for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70169] [PATCH 2/7] maint: Use reproducible timestamps and name for tarball. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 19:12:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70169@debbugs.gnu.org Received: via spool by 70169-submit@debbugs.gnu.org id=B70169.17121715107180 (code B ref 70169); Wed, 03 Apr 2024 19:12:04 +0000 Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:50 +0000 Received: from localhost ([127.0.0.1]:59661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61W-0001rj-05 for submit@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61S-0001qJ-Ao for 70169@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:47 -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 1rs61I-0000xb-GH; Wed, 03 Apr 2024 15:11:36 -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=HP9yacvC/vG8x6eHapwUJBqUkydEWlJa7qyhvBptK1M=; b=JGdKIjbRTe8Yq/HZD2yW 6tK7rdma8j4NfrH9Nf4mpeXJ0B+7ORAphnx1Bo1YeVrlf/ueEsxzW7T8RqeWby9KQwNLehWe9rZgI PWy8hUs8HNV03Xixfs9/QL96qjUfvkJw+nh6xS4QhX3z007buv/Z1c4awZfkS8iPwz4iw1SyiMbyl Rq2FBkjEnH5bs8nZGtZFHhKON+TSNZbNJyWfRL3vQIF6jlAWglEqorxhbt0ehcAKPtpx9IRmTvK/u uu+KpqQPS88Ma95cq+DwSJTqi1D2BEuSMd9R1DPTuLNRNBPG/FFdG6r8EVf8nDT3sQHF+pjBzCx8F akSZ43EhNLoSaw==; From: Janneke Nieuwenhuizen Date: Wed, 3 Apr 2024 21:11:04 +0200 Message-ID: <05e6677d56a3a23ae8526cc56c14c7de33a8254a.1712165977.git.janneke@gnu.org> 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 * Makefile.am (gen-tarball-version): Add reproducible timestamp to tarball. (am__tar): Use it in new variable, overriding the Automake default. (GZIP_ENV): New variable, overriding the Automake default. Change-Id: Iea5c2f80eaf24b2f2d80e651c73c348231de8d63 --- Makefile.am | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 2b5e145095..c33d69ed9f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ # Copyright © 2017 Mathieu Othacehe # Copyright © 2017 Leo Famulari # Copyright © 2017 Ricardo Wurmus -# Copyright © 2017, 2020, 2023 Janneke Nieuwenhuizen +# Copyright © 2017, 2020, 2023, 2024 Janneke Nieuwenhuizen # Copyright © 2017 Arun Isaac # Copyright © 2018 Nikita # Copyright © 2018 Julien Lepiller @@ -970,6 +970,7 @@ $(top_srcdir)/.version: config.status gen-tarball-version: echo $(VERSION) > "$(distdir)/.tarball-version" + git show HEAD --format=%ct --no-patch > $(distdir)/.tarball-timestamp gen-ChangeLog: $(AM_V_GEN)if test -e .git; then \ @@ -1002,6 +1003,17 @@ dist-with-updated-version: # Release management. # +# Reproducible tarball +GZIP_ENV = --no-name +# Be friendly to Debian; avoid using EPOCH +am__tar = $${TAR-tar} \ + --sort=name \ + --mode=go=rX,u+rw,a-s \ + --mtime=@$$(cat "$$tardir"/.tarball-timestamp) \ + --owner=0 --group=0 --numeric-owner \ + -cf - \ + "$$tardir" + releasedir = release-$(PACKAGE_VERSION) PACKAGE_FULL_TARNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) From patchwork Wed Apr 3 19:11:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 62680 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 CDA8D27BBEB; Wed, 3 Apr 2024 20:12:46 +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 368EE27BBE2 for ; Wed, 3 Apr 2024 20:12:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rs61n-0007fl-7B; Wed, 03 Apr 2024 15:12:07 -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 1rs61g-0007dc-Lg for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:00 -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 1rs61g-0001b9-D1 for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rs61k-0001uO-Se for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70169] [PATCH 3/7] maint: Generate 'doc/version.texi' reproducibly. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 19:12:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70169@debbugs.gnu.org Cc: Timothy Sample Received: via spool by 70169-submit@debbugs.gnu.org id=B70169.17121715117189 (code B ref 70169); Wed, 03 Apr 2024 19:12:04 +0000 Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:51 +0000 Received: from localhost ([127.0.0.1]:59665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61W-0001rl-FQ for submit@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61T-0001qL-Ay for 70169@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:47 -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 1rs61J-0000xr-Bj; Wed, 03 Apr 2024 15:11:37 -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=HA6GzH6uld62+0AFE1fJcB8wB0uy32X2XUiBkF35ZuY=; b=Y8Z9iIfDqCnQDQwqc+cs MOGuXaUqCR9SqTdngH9C0BvcF5aq+waw5PsOTBPRk+PiF+Ubem0qwgl2y2/pQH4Qc+8FouINExn2Q KG8hypLPgCiv35RP1UGxxoVB8S7P/tCTITB2UGGQfpaTZO2c5xcs1eCGMUE1LucvKh2yB5IySQoR+ ISSw8SX6LlNKGTDUnTRszFZdSyWZEb5U3+r4tHK+sqP/9EOPCifRv6+yCOA8PXhJ4EJm1/b7T713C N3ddLte7PFl/x/D5bzP6P9dWCdnhuaYk05HQOroxPn/t2By7Sa/VovM2yBmznCzBPeXLeAhJkZ1Tb IMNLilYhuq5xcQ==; From: Janneke Nieuwenhuizen Date: Wed, 3 Apr 2024 21:11:05 +0200 Message-ID: <285de866686d0e8ffdbae88b4cc5e06d5fee69ca.1712165977.git.janneke@gnu.org> 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 From: Timothy Sample * doc/local.mk ($(srcdir)/doc/stamp-vti): New rule (overriding one provided by Automake). Co-authored-by: Janneke Nieuwenhuizen Change-Id: If44965e9a3ecfb45865c58ee7a558951be8d15ae --- doc/local.mk | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/local.mk b/doc/local.mk index 8df003b891..4c8c852657 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -5,6 +5,7 @@ # Copyright © 2016 Taylan Ulrich Bayırlı/Kammer # Copyright © 2016, 2018 Mathieu Lirzin # Copyright © 2018, 2021 Julien Lepiller +# Copyright © 2019 Timothy Sample # # This file is part of GNU Guix. # @@ -247,3 +248,22 @@ $(srcdir)/%D%/guix-daemon.1: guix-daemon$(EXEEXT) endif endif + +# Reproducible tarball + +# Generate 'version.texi' reproducibly using metadata from Git rather +# than using metadata from the filesystem. +override $(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure + $(AM_V_GEN)set -e \ + export LC_ALL=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 From patchwork Wed Apr 3 19:11:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 62678 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 ADBC627BBE9; Wed, 3 Apr 2024 20:12:42 +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=unavailable 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 C180527BBE2 for ; Wed, 3 Apr 2024 20:12:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rs61j-0007eO-7M; Wed, 03 Apr 2024 15:12:03 -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 1rs61h-0007de-2F for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:01 -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 1rs61g-0001bG-QF for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rs61l-0001uW-9B for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70169] [PATCH 4/7] maint: Help help2man generate reproducible man-pages. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 19:12:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70169@debbugs.gnu.org Received: via spool by 70169-submit@debbugs.gnu.org id=B70169.17121715117197 (code B ref 70169); Wed, 03 Apr 2024 19:12:05 +0000 Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:51 +0000 Received: from localhost ([127.0.0.1]:59669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61W-0001ru-WC for submit@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61U-0001qW-38 for 70169@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:48 -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 1rs61K-0000yJ-8u; Wed, 03 Apr 2024 15:11: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:References:In-Reply-To:Date:Subject:To: From; bh=PKDkm8lbDp94w4uwEGSYLf1Png5CPHVGJLYmnkGajQU=; b=f3Ko87WLKK6Co77zS/Gw kgGHfV3dz7c0vVcpIeCXdZPcMASBujYsZmV4VNo9OkTX3156pAvD6XmsNkYf0kB3eEQVapy0qg6f8 SscYUzU+210h7bBCgHIVmMnA3B+vPLQrddLwdggu0/9RSLshwH8egqPkWQCOsCOAiSKcSMP1d+s0y 1EbYXpGX6ago5lggfFBHMaeA2LE7FG96mndv/aMG8WEr++cg/8TBd9zkFgu0EXp0xOBDb+ZO/jofk l2XArosvm1rnyryGdmkwXecv2xZcnirtskTqBawAcuYe27d2gRJ4qNB4QEvMvf+eOfBZBGtcUDSyx TSh0ppPO3PrLgw==; From: Janneke Nieuwenhuizen Date: Wed, 3 Apr 2024 21:11:06 +0200 Message-ID: <880afb1dcf4c19f493aaacfeb30912a3453e3be1.1712165977.git.janneke@gnu.org> 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 * doc/local.mk (SOURCE_DATE_EPOCH): New exported variable. Change-Id: I6636693695d5502657f1475d93d31949e0b0b39d --- doc/local.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/local.mk b/doc/local.mk index 4c8c852657..99a7e84361 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -224,6 +224,9 @@ gen_man = \ $(HELP2MANFLAGS) HELP2MANFLAGS = --source=GNU --info-page=$(PACKAGE_TARNAME) +# help2man reproducibility +SOURCE_DATE_EPOCH = $(shell git show HEAD --format=%ct --no-patch 2>/dev/null || echo 0) +export SOURCE_DATE_EPOCH $(srcdir)/%D%/guix.1: scripts/guix.in $(sub_commands_mans) -$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1` From patchwork Wed Apr 3 19:11:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 62681 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 9535327BBE2; Wed, 3 Apr 2024 20:12:48 +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 8A01827BBE9 for ; Wed, 3 Apr 2024 20:12:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rs61n-0007f0-1P; Wed, 03 Apr 2024 15:12:07 -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 1rs61i-0007eA-6E for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:02 -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 1rs61h-0001bN-97 for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rs61l-0001ue-Ok for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70169] [PATCH 5/7] maint: Generate 'doc/version-LANG.texi' reproducibly. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 19:12:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70169@debbugs.gnu.org Received: via spool by 70169-submit@debbugs.gnu.org id=B70169.17121715147235 (code B ref 70169); Wed, 03 Apr 2024 19:12:05 +0000 Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:54 +0000 Received: from localhost ([127.0.0.1]:59671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61X-0001s2-CG for submit@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61V-0001qj-0a for 70169@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:49 -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 1rs61L-0000zi-5g; Wed, 03 Apr 2024 15:11: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=jD6ePTMjJjOB1I3eR675QNNl+0TxWI/EHc3pSA3S8G8=; b=mOUnpnwrmdmzCf4ASrqb npYn5wkLogltBqRxpqqcN8pJUkrihN+6gjGLxnXPGYd9ZzI0filyHr8/mZOndTa+3lldn4ugxhHSl 0PSfl7X8IO7DUuWp2sWya2MzipBmpntODSnBwgwBOeT45GtHz8tGSjlUYmn9LGLAa91XJrT9XFf8x or9O4kc06wQi2nndHywhr+5Er/6KTEGt1ismoC1qgwPXq9uuWYxaXlrBSRWuCoKM+gnfy0YHVa7Fy 07KnV4F/P7aZg+sRsIFAxK5kWIjMJksY/SYLc4YFncGCoyOTUIyYHYXdA00TReavyibSNtrvWasN3 Xfm5Pr0UXWOr5g==; From: Janneke Nieuwenhuizen Date: Wed, 3 Apr 2024 21:11:07 +0200 Message-ID: <947bed93d2e2fec221fdec0d247f61912fb89567.1712165977.git.janneke@gnu.org> 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 * doc/local.mk ($(srcdir)/doc/stamp-vti): Change rule into... (version.texi-from-git): ...this new function. Call it with vti,guix.texi,; and for all MANUAL_LANGUAGES with $(i),po/doc/guix-manual.$(lang).po, -$(lang.po). Change-Id: Ia8df618178066cad320eecea0299337224e23a73 --- doc/local.mk | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/doc/local.mk b/doc/local.mk index 99a7e84361..893c99e1b1 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -6,6 +6,7 @@ # Copyright © 2016, 2018 Mathieu Lirzin # Copyright © 2018, 2021 Julien Lepiller # Copyright © 2019 Timothy Sample +# Copyright © 2024 Janneke Nieuwenhuizen # # This file is part of GNU Guix. # @@ -254,19 +255,28 @@ endif # Reproducible tarball -# Generate 'version.texi' reproducibly using metadata from Git rather -# than using metadata from the filesystem. -override $(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure - $(AM_V_GEN)set -e \ - export LC_ALL=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 +# 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 +override $(srcdir)/doc/stamp-$(1): $(srcdir)/$(2) $(top_srcdir)/configure + $$(AM_V_GEN)set -e \ + export LC_ALL=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 + +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)))) From patchwork Wed Apr 3 19:11:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 62679 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 2A9EF27BBEA; Wed, 3 Apr 2024 20:12:45 +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 9C19727BBE2 for ; Wed, 3 Apr 2024 20:12:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rs61n-0007g5-S4; Wed, 03 Apr 2024 15:12:07 -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 1rs61j-0007eR-9D for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:03 -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 1rs61j-0001bc-08 for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rs61m-0001ut-Lm; Wed, 03 Apr 2024 15:12:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70169] [PATCH 6/7] maint: Use reproducible Git timestamp for POT-Creation-Date. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 19:12:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70169@debbugs.gnu.org Cc: Florian Pelz , Julien Lepiller X-Debbugs-Original-Xcc: Florian Pelz , Julien Lepiller Received: via spool by 70169-submit@debbugs.gnu.org id=B70169.17121715187274 (code B ref 70169); Wed, 03 Apr 2024 19:12:06 +0000 Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:58 +0000 Received: from localhost ([127.0.0.1]:59675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61d-0001tA-KC for submit@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61W-0001r4-AL for 70169@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:53 -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 1rs61L-00013s-Vx; Wed, 03 Apr 2024 15:11: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=7/gvstY+zOeit9YGSfTKoBpkqJ4p21aBFe+MX6ZXKzs=; b=BJ5uFF0e57LFp3PJ4hjs EHQtGS0ScrhMNbOrvClLVcJTHUe+2C/Hng7mrwEBgIOCjqzreA0jXCGRsVTMFctDRE6cGWuOcxAJn lHKvJFSzDr3WbS7aJwDxo2f6vEf/mAAz7sqdV4f5VpsetRyAY1GCRZg+wOXI520/Cc04eboJwtOom dVY8EsNb5+q8zLjQdmpcOpR51nh7IFyblX8hJqzMPt/w5OWoFjrkLPvQ+iKq/YiWSWma7BaUY1y36 0qgRY7AD1nNKjCII/IFzA+VosaZ0t23RUa7JXFkCbQ6HmXrGekvejaP4Kzg9I2eaM1wWnrHEhfeS+ xjVfFezJjAZd1g==; From: Janneke Nieuwenhuizen Date: Wed, 3 Apr 2024 21:11:08 +0200 Message-ID: <45e5e23d88c8846551c7493d3e9ab344dcb2f942.1712165977.git.janneke@gnu.org> 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 * po/doc/local.mk (%D%/%.pot): Replace POT-Creation-Date using timestamp from Git. (%D%/guix-manual.pot): Likewise. Change-Id: I1b7f8cc147084c1804deb7be9d36e5eeda2599cb --- po/doc/local.mk | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/po/doc/local.mk b/po/doc/local.mk index dd6ba30133..f68d67ec02 100644 --- a/po/doc/local.mk +++ b/po/doc/local.mk @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2018 Julien Lepiller # Copyright © 2021 Maxim Cournoyer +# Copyright © 2024 Janneke Nieuwenhuizen # # This file is part of GNU Guix. # @@ -44,12 +45,19 @@ POT_OPTIONS = \ --msgid-bugs-address "bug-guix@gnu.org" %D%/%.pot: $(srcdir)/doc/%.texi - $(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \ - -p "$@" $(POT_OPTIONS) && \ - touch $@ + $(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \ + -p "$@-t" $(POT_OPTIONS) + date=$$(git log --pretty=format:%ci -n 1 -- $< 2>/dev/null \ + || echo $(SOURCE_DATE_EPOCH)) \ + sed -ri -e "s,^(.POT-Creation-Date: )[^\]*,\1$$date," $@-t + mv $@-t $@ %D%/guix-manual.pot: %D%/guix.pot %D%/contributing.pot - msgcat $^ > $@ + msgcat $^ > $@-t + date=$$(git log --pretty=format:%ci -n 1 -- $< 2>/dev/null \ + || echo $(SOURCE_DATE_EPOCH)) \ + sed -ri "s,^(.POT-Creation-Date: )[^\]*,\1$$date," $@-t + mv $@-t $@ doc-pot-update: %D%/guix-manual.pot %D%/guix-cookbook.pot .PHONY: doc-pot-update From patchwork Wed Apr 3 19:11:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 62677 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 2682127BBE9; Wed, 3 Apr 2024 20:12:40 +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=unavailable 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 38FB827BBE2 for ; Wed, 3 Apr 2024 20:12:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rs61k-0007et-Ls; Wed, 03 Apr 2024 15:12:04 -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 1rs61i-0007eB-6b for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:02 -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 1rs61h-0001bQ-Nf for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rs61m-0001ul-6d for guix-patches@gnu.org; Wed, 03 Apr 2024 15:12:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70169] [PATCH 7/7] maint: Ensure generated file reproducibility for dist. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 19:12:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70169@debbugs.gnu.org Received: via spool by 70169-submit@debbugs.gnu.org id=B70169.17121715177267 (code B ref 70169); Wed, 03 Apr 2024 19:12:06 +0000 Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:57 +0000 Received: from localhost ([127.0.0.1]:59673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61d-0001t8-4J for submit@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs61W-0001r7-LN for 70169@debbugs.gnu.org; Wed, 03 Apr 2024 15:11:53 -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 1rs61M-00016p-Rd; Wed, 03 Apr 2024 15:11: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=4S0UlO/19bjUAyI1hTF6D9hai0yyACFDl+CsYxym4+A=; b=XfAhGQbZPv6skcgs1UwS 1/xgftC6zfnveBmZkFq2rQquMd4nQf7lV2QJje9uCR1rvbRyPZ0KyElCuU6iSeZ5BSFGPYHK5s3R0 iyNHU7OPBfBF/M3i04mQsKKwKbIsbSWwWZ2BGfi/UDEmIlugz8LGEQTYrv/NF8bMhy0OAcCadeiEF C+94CR770cUcA2tqq6fBbDUktthHdHz1dwqPgUOJxVNBAhDjBHm5bZXiKOSgqTtV/dJvoS794MA0K N5WUNqZWJWlpgsXijyo1uJ/IWk7ZOoF6LFSELjzhexLlECvksoWzz4FmW+y4pDItONMetwItfAsdg +NM1gPs68MJVUA==; From: Janneke Nieuwenhuizen Date: Wed, 3 Apr 2024 21:11:09 +0200 Message-ID: <80a2280ce7a14f1b8770dad24a230a569143d304.1712165977.git.janneke@gnu.org> 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 * doc/local.mk (override $(srcdir)/doc/stamp-vti): New target override. (doc-clean, man-clean): New targets. (auto-clean): Depend on it in new target. (DIST_CONFIGURE_FLAGS): New variable. (dist-hook): Use them. Change-Id: I7b8a3d9ef1e4a4eddb7c329a2c27f481a451b84b --- doc/local.mk | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/doc/local.mk b/doc/local.mk index 893c99e1b1..a8e59bb7e6 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -280,3 +280,24 @@ $(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 + +dist: auto-clean +auto-clean: maintainer-clean-vti doc-clean man-clean + rm -f ABOUT-NLS INSTALL + rm -f aclocal.m4 configure libtool Makefile.in + git clean -fdx -- build-aux + ./bootstrap + ./configure $(DIST_CONFIGURE_FLAGS) + +doc-clean: + rm -f $(srcdir)/doc/stamp* + rm -f $(DOT_FILES:%.dot=%.png) + rm -f $(filter-out %D%/guix.texi %D%/guix-cookbook.texi, $(info_TEXINFOS)) + rm -f $(srcdir)/po/doc/*.pot $(srcdir)/po/guix/*.pot $(srcdir)/po/packages/*.pot + +man-clean: + rm -f $(srcdir)/doc/*.1