[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: debootstrap: Hardcode location of archive keyrings.
From: |
guix-commits |
Subject: |
02/03: gnu: debootstrap: Hardcode location of archive keyrings. |
Date: |
Thu, 14 Sep 2023 04:38:35 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 6226b8f72d87583322b075d4c51f253f9b13bc07
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu Sep 14 11:12:28 2023 +0300
gnu: debootstrap: Hardcode location of archive keyrings.
* gnu/packages/debian.scm (debootstrap)[arguments]: Adjust custom
'patch-source phase to hardcode the location of the archive keyrings.
---
gnu/packages/debian.scm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index 78cdd0d3f4..f011802ed3 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -226,6 +226,12 @@ contains the archive keys used for that.")
(substitute* "debootstrap"
(("=/usr") (string-append "=" #$output))
(("/usr/bin/dpkg") (search-input-file inputs "/bin/dpkg")))
+ ;; Include the keyring locations by default.
+ (substitute* (find-files "scripts")
+ (("keyring.*(debian-archive-keyring.gpg)"_ keyring)
+ (string-append "keyring " debian "/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
;; workaround for: https://bugs.debian.org/929889
(substitute* "functions"