From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
To: 68555@debbugs.gnu.org, Efraim Flashner <efraim@flashner.co.il>
Cc: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Subject: [bug#68555] [PATCH v2 2/3] gnu: debootstrap: use trisquel-keyring.
Date: Wed, 24 Jan 2024 01:00:01 +0100 [thread overview]
Message-ID: <0e085f567ff240e981a2e8a6b80c15ce4b486c29.1706054193.git.GNUtoo@cyberdimension.org> (raw)
In-Reply-To: <bf7e36be55fe08fbbc0d1852c54121766b176468.1706054193.git.GNUtoo@cyberdimension.org>
* 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(+)
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
--
2.41.0
next prev parent reply other threads:[~2024-01-24 0:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-17 22:48 [bug#68555] [PATCH 0/3] debootstrap: Add Trisquel support Denis 'GNUtoo' Carikli
2024-01-17 23:29 ` [bug#68555] [PATCH 1/3] gnu: Add trisquel-keyring Denis 'GNUtoo' Carikli
2024-01-19 9:38 ` Efraim Flashner
2024-01-23 23:49 ` Denis 'GNUtoo' Carikli
2024-01-24 0:04 ` Denis 'GNUtoo' Carikli
2024-01-17 23:29 ` [bug#68555] [PATCH 2/3] gnu: debootstrap: use trisquel-keyring Denis 'GNUtoo' Carikli
2024-01-17 23:29 ` [bug#68555] [PATCH 3/3] gnu: debootstrap: Add zstd dependency Denis 'GNUtoo' Carikli
2024-01-24 0:00 ` [bug#68555] [PATCH v2 1/3] gnu: Add trisquel-keyring Denis 'GNUtoo' Carikli
2024-01-24 0:00 ` Denis 'GNUtoo' Carikli [this message]
2024-01-24 0:00 ` [bug#68555] [PATCH v2 3/3] gnu: debootstrap: Add zstd dependency Denis 'GNUtoo' Carikli
2024-02-12 12:44 ` bug#68555: [PATCH v2 1/3] gnu: Add trisquel-keyring 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=0e085f567ff240e981a2e8a6b80c15ce4b486c29.1706054193.git.GNUtoo@cyberdimension.org \
--to=gnutoo@cyberdimension.org \
--cc=68555@debbugs.gnu.org \
--cc=efraim@flashner.co.il \
/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.