guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#68555] [PATCH 2/3] gnu: debootstrap: use trisquel-keyring.


From: Denis 'GNUtoo' Carikli
Subject: [bug#68555] [PATCH 2/3] gnu: debootstrap: use trisquel-keyring.
Date: Thu, 18 Jan 2024 00:29:54 +0100

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

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

diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index 4e398f619c..7c2d7fedfb 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"))
+                     (trisquel #$(this-package-input "trisquel-keyring"))
                      (ubuntu #$(this-package-input "ubuntu-keyring")))
                  (substitute* "Makefile"
                    (("/usr") ""))
@@ -270,6 +271,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")))
@@ -277,6 +283,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
@@ -301,6 +309,7 @@ (define-public debootstrap
          #:tests? #f))  ; no tests
     (inputs
      (list debian-archive-keyring
+           trisquel-keyring
            ubuntu-keyring
            bash-minimal
            dpkg
-- 
2.41.0






reply via email to

[Prev in Thread] Current Thread [Next in Thread]