[bug#70081] [PATCH 0/2] debootstrap: Add PureOS support.

[bug#70081] [PATCH 0/2] debootstrap: Add PureOS support.

[Denis 'GNUtoo' Carikli]

Hi,

In the previous patchset I added Trisquel support in debootstrap and I could
not include the code that added PureOS support because debootstraping PureOS
didn't work due to a change in the PureOS repository structure.

Now that it's fixed upstream (in PureOS and/or newer debootstrap versions),
after installing the debootstrap included in this patchset we can easily
debootstrap PureOS byzantium:
    $ sudo -E debootstrap byzantium rootfs https://repo.puri.sm/pureos
    $ sudo chroot rootfs/ /bin/cat /etc/os-release
    ID=pureos
    NAME=PureOS
    PRETTY_NAME="PureOS 10 (Byzantium)"
    
    VERSION_ID="10"
    VERSION_CODENAME=byzantium
    
    HOME_URL="https://pureos.net/"
    SUPPORT_URL="https://puri.sm/faq/#faq-WherecanIfindoutmoreaboutPureOS"
    BUG_REPORT_URL="https://tracker.pureos.net/"
    
    LOGO=pureos-logo-icon

Denis 'GNUtoo' Carikli (2):
  gnu: Add pureos-archive-keyring.
  gnu: debootstrap: Use pureos-archive-keyring.

 gnu/packages/debian.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)


base-commit: 0ff72d105ca03a82de6bb5193266fd05fce72daf
-- 
2.41.0

[bug#70081] [PATCH 1/2] gnu: Add pureos-archive-keyring.

[Denis 'GNUtoo' Carikli]

* gnu/packages/debian.scm (pureos-archive-keyring): New variable.

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

diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index 1715b963a9..4aa432abfa 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -148,6 +148,31 @@ (define-public debian-ports-archive-keyring
     ;; "The keys in the keyrings don't fall under any copyright."
     (license license:public-domain)))
 
+(define-public pureos-archive-keyring
+  (package
+    (name "pureos-archive-keyring")
+    (version "2021.11.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://repo.puri.sm/pureos/pool/main/p/pureos-archive-keyring/"
+                    "pureos-archive-keyring_" version ".tar.xz"))
+              (sha256
+               (base32
+                "1a0d084a98bycyhbw531646rbivvlfkdk6ldshl5dy6fvzmbci0d"))))
+    (build-system copy-build-system)
+    (arguments
+     '(#:install-plan '(("keyrings/pureos-archive-keyring.gpg"
+                         "share/keyrings/")
+                        ("keyrings/pureos-archive-removed-keys.gpg"
+                         "share/keyrings/"))))
+    (home-page "https://source.puri.sm/pureos/core/pureos-archive-keyring")
+    (synopsis "GnuPG archive keys of the Pureos archive")
+    (description "The Pureos distribution signs its packages.  This package
+contains the archive keys used for that.")
+    (license (list license:public-domain ;; the keys
+                   license:gpl2+))))     ;; see debian/copyright
+
 (define-public trisquel-keyring
   (package
     (name "trisquel-keyring")
-- 
2.41.0

[bug#70081] [PATCH 2/2] gnu: debootstrap: Use pureos-archive-keyring.

[Denis 'GNUtoo' Carikli]

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

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

diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index 4aa432abfa..a88fb04feb 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"))
+                     (pureos #$(this-package-input "pureos-archive-keyring"))
                      (trisquel #$(this-package-input "trisquel-keyring"))
                      (ubuntu #$(this-package-input "ubuntu-keyring")))
                  (substitute* "Makefile"
@@ -271,6 +272,11 @@ (define-public debootstrap
                    (("/usr") debian))
                  (substitute* "scripts/gutsy"
                    (("/usr") ubuntu))
+                 (substitute* "scripts/amber"
+                   (("/usr/share/keyrings/pureos-archive-keyring.gpg")
+                    (string-append
+                     pureos
+                     "/share/keyrings/pureos-archive-keyring.gpg")))
                  (substitute* "scripts/robur"
                    (("/usr/share/keyrings/trisquel-archive-keyring.gpg")
                     (string-append
@@ -283,6 +289,8 @@ (define-public debootstrap
                  (substitute* (find-files "scripts")
                    (("keyring.*(debian-archive-keyring.gpg)"_ keyring)
                     (string-append "keyring " debian "/share/keyrings/" keyring))
+                   (("keyring.*(pureos-archive-keyring.gpg)" _ keyring)
+                    (string-append "keyring " pureos "/share/keyrings/" keyring))
                    (("keyring.*(trisquel-archive-keyring.gpg)" _ keyring)
                     (string-append "keyring " trisquel "/share/keyrings/" keyring))
                    (("keyring.*(ubuntu-archive-keyring.gpg)" _ keyring)
@@ -309,6 +317,7 @@ (define-public debootstrap
          #:tests? #f))  ; no tests
     (inputs
      (list debian-archive-keyring
+           pureos-archive-keyring
            trisquel-keyring
            ubuntu-keyring
            bash-minimal
-- 
2.41.0

bug#70081: [PATCH 0/2] debootstrap: Add PureOS support.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

Thanks. Patches pushed!

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]