From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id MJ3bCzRClF+GRQAA0tVLHw (envelope-from ) for ; Sat, 24 Oct 2020 15:03:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id CCqtBzRClF88AwAAB5/wlQ (envelope-from ) for ; Sat, 24 Oct 2020 15:03:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6535C94066D for ; Sat, 24 Oct 2020 15:03:13 +0000 (UTC) Received: from localhost ([::1]:41182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWL4a-0004aY-6r for larch@yhetil.org; Sat, 24 Oct 2020 11:03:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWL4R-0004Xz-9k for bug-guix@gnu.org; Sat, 24 Oct 2020 11:03:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50969) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kWL4Q-0008C8-04 for bug-guix@gnu.org; Sat, 24 Oct 2020 11:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kWL4P-0001Zv-Tf for bug-guix@gnu.org; Sat, 24 Oct 2020 11:03:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#41764: `make authenticate` fails to find the keyring branch Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 24 Oct 2020 15:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41764 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas Received: via spool by 41764-submit@debbugs.gnu.org id=B41764.16035517586035 (code B ref 41764); Sat, 24 Oct 2020 15:03:01 +0000 Received: (at 41764) by debbugs.gnu.org; 24 Oct 2020 15:02:38 +0000 Received: from localhost ([127.0.0.1]:34282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWL42-0001ZF-DN for submit@debbugs.gnu.org; Sat, 24 Oct 2020 11:02:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWL41-0001Z4-1Y for 41764@debbugs.gnu.org; Sat, 24 Oct 2020 11:02:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47872) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWL3v-0008BD-C1; Sat, 24 Oct 2020 11:02:31 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51806 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kWL3u-0005NL-2U; Sat, 24 Oct 2020 11:02:30 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200608185404.GA2356@jasmine.lan> <87img0gqpr.fsf@gnu.org> <87v9ezhjq0.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 3 Brumaire an 229 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sat, 24 Oct 2020 17:02:28 +0200 In-Reply-To: <87v9ezhjq0.fsf@gmail.com> ("Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas"'s message of "Sat, 24 Oct 2020 14:49:43 +0200") Message-ID: <87h7qjk6pn.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 41764@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: 1T4fbx0eg/lJ Hi! Miguel =C3=81ngel Arruga Vivas skribis: > From 479ac6846cb228b67b778965f0f5299ea3172424 Mon Sep 17 00:00:00 2001 > From: =3D?UTF-8?q?Miguel=3D20=3DC3=3D81ngel=3D20Arruga=3D20Vivas?=3D > > Date: Sat, 24 Oct 2020 14:35:09 +0200 > Subject: [PATCH] build: Add GUIX_GIT_KEYRING variable for make authentica= te. > > * Makefile.am (GUIX_GIT_KEYRING): New variable. > (authenticate): Use GUIX_GIT_KEYRING to select the keyring branch > reference. > * doc/contributing.texi (Building from Git): Add an example about the > use of GUIX_GIT_KEYRING. > --- > Makefile.am | 2 ++ > doc/contributing.texi | 10 ++++++++++ > 2 files changed, 12 insertions(+) > > diff --git a/Makefile.am b/Makefile.am > index c509562567..e6cef9ec1a 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -666,9 +666,11 @@ channel_intro_commit =3D 9edb3f66fd807b096b48283debd= cddccfea34bad > channel_intro_signer =3D BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 5= 4FA >=20=20 > # Authenticate the current Git checkout by checking signatures on every = commit. > +GUIX_GIT_KEYRING =3D origin/keyring You need =E2=80=9C?=3D=E2=80=9D or users won=E2=80=99t be able to override = it. > authenticate: > $(AM_V_at)echo "Authenticating Git checkout..." ; \ > guix git authenticate \ > + --keyring=3D$(GUIX_GIT_KEYRING) \ > --cache-key=3Dchannels/guix --stats \ > "$(channel_intro_commit)" "$(channel_intro_signer)" >=20=20 > diff --git a/doc/contributing.texi b/doc/contributing.texi > index 26a4627464..9312faa849 100644 > --- a/doc/contributing.texi > +++ b/doc/contributing.texi > @@ -140,6 +140,16 @@ make authenticate >=20=20 > The first run takes a couple of minutes, but subsequent runs are faster. >=20=20 > +Or, when your configuration for your local git repository doesn't match > +the default one, you can provide the reference for the @code{keyring} > +branch through the variable @code{GUIX_GIT_KEYRING}. The following > +example assumes that you have a git remote called @samp{myremote} > +pointing to the official repository: > + > +@example > +make authenticate GUIX_GIT_KEYRING=3Dmyremote/keyring > +@end example s/git/Git/ in the paragraph, but otherwise LGTM! =E2=80=98origin/keyring= =E2=80=99 is certainly a better default than =E2=80=98keyring=E2=80=99. Thanks, Ludo=E2=80=99.