all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
To: 70081@debbugs.gnu.org
Cc: "Denis 'GNUtoo' Carikli" <GNUtoo@cyberdimension.org>
Subject: [bug#70081] [PATCH 2/2] gnu: debootstrap: Use pureos-archive-keyring.
Date: Sat, 30 Mar 2024 08:55:06 +0100	[thread overview]
Message-ID: <f0f9b5370ff42b2117f49d00d06c61795e491249.1711668771.git.GNUtoo@cyberdimension.org> (raw)
In-Reply-To: <cover.1711668771.git.GNUtoo@cyberdimension.org>

* gnu/packages/debian.scm (debootstrap): [arguments]: In 'patch-source'
phase, use pureos-archive-keyring.
[inputs]: Add pureos-archive-keyring.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Change-Id: I8bf0a7db50c66dcf3541e5c7244350ff9523d921
---
 gnu/packages/debian.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index 4aa432abfa..a88fb04feb 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -258,6 +258,7 @@ (define-public debootstrap
            (add-after 'unpack 'patch-source
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let ((debian #$(this-package-input "debian-archive-keyring"))
+                     (pureos #$(this-package-input "pureos-archive-keyring"))
                      (trisquel #$(this-package-input "trisquel-keyring"))
                      (ubuntu #$(this-package-input "ubuntu-keyring")))
                  (substitute* "Makefile"
@@ -271,6 +272,11 @@ (define-public debootstrap
                    (("/usr") debian))
                  (substitute* "scripts/gutsy"
                    (("/usr") ubuntu))
+                 (substitute* "scripts/amber"
+                   (("/usr/share/keyrings/pureos-archive-keyring.gpg")
+                    (string-append
+                     pureos
+                     "/share/keyrings/pureos-archive-keyring.gpg")))
                  (substitute* "scripts/robur"
                    (("/usr/share/keyrings/trisquel-archive-keyring.gpg")
                     (string-append
@@ -283,6 +289,8 @@ (define-public debootstrap
                  (substitute* (find-files "scripts")
                    (("keyring.*(debian-archive-keyring.gpg)"_ keyring)
                     (string-append "keyring " debian "/share/keyrings/" keyring))
+                   (("keyring.*(pureos-archive-keyring.gpg)" _ keyring)
+                    (string-append "keyring " pureos "/share/keyrings/" keyring))
                    (("keyring.*(trisquel-archive-keyring.gpg)" _ keyring)
                     (string-append "keyring " trisquel "/share/keyrings/" keyring))
                    (("keyring.*(ubuntu-archive-keyring.gpg)" _ keyring)
@@ -309,6 +317,7 @@ (define-public debootstrap
          #:tests? #f))  ; no tests
     (inputs
      (list debian-archive-keyring
+           pureos-archive-keyring
            trisquel-keyring
            ubuntu-keyring
            bash-minimal
-- 
2.41.0





  parent reply	other threads:[~2024-03-30  7:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-29 18:23 [bug#70081] [PATCH 0/2] debootstrap: Add PureOS support Denis 'GNUtoo' Carikli
2024-03-30  7:55 ` [bug#70081] [PATCH 1/2] gnu: Add pureos-archive-keyring Denis 'GNUtoo' Carikli
2024-03-30  7:55 ` Denis 'GNUtoo' Carikli [this message]
2024-04-02 18:16 ` bug#70081: [PATCH 0/2] debootstrap: Add PureOS support Efraim Flashner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f0f9b5370ff42b2117f49d00d06c61795e491249.1711668771.git.GNUtoo@cyberdimension.org \
    --to=gnutoo@cyberdimension.org \
    --cc=70081@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.