diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2024-01-24 01:00:01 +0100 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2024-02-12 14:41:46 +0200 |
| commit | bb92a4d7bc71197a51eea9075387c5313f299085 (patch) | |
| tree | d4a69b8a72b0551a665aabfb007a4adeae1012fb | |
| parent | 15a9652e741a178db8ebb04bc13b0097e5314f7d (diff) | |
| download | guix-bb92a4d7bc71197a51eea9075387c5313f299085.tar.gz guix-bb92a4d7bc71197a51eea9075387c5313f299085.zip | |
gnu: debootstrap: use trisquel-keyring.
* gnu/packages/debian.scm (debootstrap): [arguments]: In 'patch-source'
phase, use trisquel-keyring.
[inputs]: Add trisquel-keyring, zstd.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
Change-Id: I43d5543db4374b373dac65f65cfcef6a3df3b5bf
| -rw-r--r-- | gnu/packages/debian.scm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index bd6baffa2f..1715b963a9 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -233,6 +233,7 @@ contains the archive keys used for that.") (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 @@ contains the archive keys used for that.") (("/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 @@ contains the archive keys used for that.") (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,11 +284,14 @@ contains the archive keys used for that.") #:tests? #f)) ; no tests (inputs (list debian-archive-keyring + trisquel-keyring ubuntu-keyring bash-minimal dpkg tzdata - + ;; Needed by dpkg-deb in extract_dpkg_deb_data for at least + ;; Trisquel 11 (aramo). + zstd ;; Called at run-time from various places, needs to be in PATH. gnupg wget)) |