From patchwork Wed Jan 24 00:00:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 59353 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 AE47A27BBEA; Wed, 24 Jan 2024 00:01:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 2A3A227BBE2 for ; Wed, 24 Jan 2024 00:01:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSQhV-000479-7F; Tue, 23 Jan 2024 19:01:05 -0500 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 1rSQhO-00046d-Um for guix-patches@gnu.org; Tue, 23 Jan 2024 19:00:58 -0500 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 1rSQhO-0006vT-2Q for guix-patches@gnu.org; Tue, 23 Jan 2024 19:00:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSQhS-0007gU-VK for guix-patches@gnu.org; Tue, 23 Jan 2024 19:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68555] [PATCH v2 2/3] gnu: debootstrap: use trisquel-keyring. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Jan 2024 00:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68555 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68555@debbugs.gnu.org, Efraim Flashner Cc: Denis 'GNUtoo' Carikli Received: via spool by 68555-submit@debbugs.gnu.org id=B68555.170605442929475 (code B ref 68555); Wed, 24 Jan 2024 00:01:02 +0000 Received: (at 68555) by debbugs.gnu.org; 24 Jan 2024 00:00:29 +0000 Received: from localhost ([127.0.0.1]:44141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSQgu-0007fK-Tu for submit@debbugs.gnu.org; Tue, 23 Jan 2024 19:00:29 -0500 Received: from cyberdimension.org ([80.67.179.20]:44046 helo=gnutoo.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSQgp-0007ej-25 for 68555@debbugs.gnu.org; Tue, 23 Jan 2024 19:00:23 -0500 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id eae826be; Wed, 24 Jan 2024 00:00:13 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 509af9e4; Wed, 24 Jan 2024 00:00:13 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Wed, 24 Jan 2024 01:00:01 +0100 Message-ID: <0e085f567ff240e981a2e8a6b80c15ce4b486c29.1706054193.git.GNUtoo@cyberdimension.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 * gnu/packages/debian.scm (debootstrap): [arguments]: In 'patch-source' phase, use trisquel-keyring. [inputs]: Add trisquel-keyring. Signed-off-by: Denis 'GNUtoo' Carikli --- ChangeLog since v1: no changes. --- gnu/packages/debian.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index bd6baffa2f..33c39e809e 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -233,6 +233,7 @@ (define-public debootstrap (add-after 'unpack 'patch-source (lambda* (#:key inputs outputs #:allow-other-keys) (let ((debian #$(this-package-input "debian-archive-keyring")) + (trisquel #$(this-package-input "trisquel-keyring")) (ubuntu #$(this-package-input "ubuntu-keyring"))) (substitute* "Makefile" (("/usr") "")) @@ -245,6 +246,11 @@ (define-public debootstrap (("/usr") debian)) (substitute* "scripts/gutsy" (("/usr") ubuntu)) + (substitute* "scripts/robur" + (("/usr/share/keyrings/trisquel-archive-keyring.gpg") + (string-append + trisquel + "/share/keyrings/trisquel-archive-keyring.gpg"))) (substitute* "debootstrap" (("=/usr") (string-append "=" #$output)) (("/usr/bin/dpkg") (search-input-file inputs "/bin/dpkg"))) @@ -252,6 +258,8 @@ (define-public debootstrap (substitute* (find-files "scripts") (("keyring.*(debian-archive-keyring.gpg)"_ keyring) (string-append "keyring " debian "/share/keyrings/" keyring)) + (("keyring.*(trisquel-archive-keyring.gpg)" _ keyring) + (string-append "keyring " trisquel "/share/keyrings/" keyring)) (("keyring.*(ubuntu-archive-keyring.gpg)" _ keyring) (string-append "keyring " ubuntu "/share/keyrings/" keyring))) ;; Ensure PATH works both in guix and within the debian chroot @@ -276,6 +284,7 @@ (define-public debootstrap #:tests? #f)) ; no tests (inputs (list debian-archive-keyring + trisquel-keyring ubuntu-keyring bash-minimal dpkg