Subject: [bug#70081] [PATCH 2/2] gnu: debootstrap: Use pureos-archive-keyring.

From: Denis 'GNUtoo' Carikli <[email-masked]>
Date: Sat, 30 Mar 2024 08:55:06 +0100

* 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 <[email-masked]>
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