@@ -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
* 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> --- ChangeLog since v1: no changes. --- gnu/packages/debian.scm | 9 +++++++++ 1 file changed, 9 insertions(+)