unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Herman Rimm via Guix-patches via <guix-patches@gnu.org>
To: 68524@debbugs.gnu.org
Cc: Lilah Tascheter <lilah@lunabee.space>,
	Efraim Flashner <efraim@flashner.co.il>,
	Vagrant Cascadian <vagrant@debian.org>
Subject: [bug#68524] [PATCH v3 2/5] gnu: packages: Add ukify.
Date: Wed, 25 Sep 2024 13:12:00 +0200	[thread overview]
Message-ID: <4a8e3c9cef67f009b6fcb00739bdba3d46c2a2a6.1727262600.git.herman@rimm.ee> (raw)
In-Reply-To: <cover.1727262600.git.herman@rimm.ee>

From: Lilah Tascheter <lilah@lunabee.space>

* gnu/packages/bootloaders.scm (%systemd-version, systemd-source,
ukify): New variables.

Change-Id: Icde59b7266529c8002331ff0375e0a35af3a2add
---
 gnu/packages/bootloaders.scm | 57 ++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 2f115f6bb3..52d92ba03a 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2023-2024 Herman Rimm <herman@rimm.ee>
 ;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 Lilah Tascheter <lilah@lunabee.space>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -48,6 +49,7 @@ (define-module (gnu packages bootloaders)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cross-base)
   #:use-module (gnu packages disk)
+  #:use-module (gnu packages efi)
   #:use-module (gnu packages firmware)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
@@ -76,11 +78,13 @@ (define-module (gnu packages bootloaders)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages virtualization)
   #:use-module (gnu packages xorg)
+  #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
   #:use-module (guix gexp)
@@ -576,6 +580,59 @@ (define-public syslinux
                      ;; Also contains:
                      license:expat license:isc license:zlib)))))
 
+(define %systemd-version "255")
+(define systemd-source
+  (origin
+    (method git-fetch)
+    (uri (git-reference
+           (url "https://github.com/systemd/systemd")
+           (commit (string-append "v" %systemd-version))))
+    (file-name (git-file-name "systemd" %systemd-version))
+    (snippet #~(substitute* "src/ukify/ukify.py"
+                 ;; Remove after python 3.11.
+                 (("datetime\\.UTC") "datetime.timezone.utc")))
+    (modules '((guix build utils)))
+    (sha256
+      (base32
+        "1qdyw9g3jgvsbc1aryr11gpc3075w5pg00mqv4pyf3hwixxkwaq6"))))
+
+(define-public ukify
+  (package
+    (name "ukify")
+    (version %systemd-version)
+    (source systemd-source)
+    (build-system python-build-system)
+    (arguments
+      (list
+        #:phases
+        #~(modify-phases %standard-phases
+            (replace 'build
+              (lambda* (#:key inputs #:allow-other-keys)
+                (define (get-tool tool)
+                  (search-input-file inputs (string-append "bin/" tool)))
+                ;; Hardcode the tool paths.
+                (substitute* "src/ukify/ukify.py"
+                  (("(find_tool\\(')(readelf|sbsign|pesign)'," _ ctx tool)
+                   (string-append ctx (get-tool tool) "',"))
+                  (("('name': ')(sbverify|pesign)'," _ ctx tool)
+                   (string-append ctx (get-tool tool) "',")))))
+            (delete 'check)
+            (replace 'install
+              (lambda* (#:key inputs #:allow-other-keys)
+                (let* ((bin (string-append #$output "/bin"))
+                       (file (string-append bin "/ukify")))
+                  (mkdir-p bin)
+                  (copy-file "src/ukify/ukify.py" file)))))))
+    (inputs
+      (list binutils pesign python-cryptography python-pefile sbsigntools))
+    (home-page "https://systemd.io/")
+    (synopsis "Unified kernel image UEFI tool")
+    (description
+      "@command{ukify} joins together a UKI stub, linux kernel, initrd,
+kernel arguments, and optional secure boot signatures into a single,
+UEFI-bootable image.")
+    (license license:lgpl2.1+)))
+
 (define-public dtc
   (package
     (name "dtc")
-- 
2.45.2





  parent reply	other threads:[~2024-09-25 12:30 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-17  4:23 [bug#68524] [PATCH 0/2] Support root encryption and secure boot Lilah Tascheter via Guix-patches
2024-01-17  4:23 ` [bug#68525] [PATCH 1/2] gnu: bootloaders: Add uki packages Lilah Tascheter via Guix-patches
2024-01-17  4:23 ` [bug#68526] [PATCH 2/2] gnu: bootloaders: Add uefi-uki-bootloader Lilah Tascheter via Guix-patches
2024-01-17  4:48 ` [bug#68524] [PATCH 1/2] gnu: bootloaders: Add uki packages Lilah Tascheter via Guix-patches
2024-01-17  4:48   ` [bug#68524] [PATCH 2/2] gnu: bootloaders: Add uefi-uki-bootloader Lilah Tascheter via Guix-patches
2024-01-25 10:03     ` Herman Rimm via Guix-patches via
2024-01-28  0:50       ` Lilah Tascheter via Guix-patches
2024-01-28  9:51 ` [bug#68524] [PATCH v2 0/2] Support root encryption and secure boot Lilah Tascheter via Guix-patches
2024-01-28  9:51   ` [bug#68524] [PATCH v2 1/2] gnu: bootloaders: Add uki packages Lilah Tascheter via Guix-patches
2024-02-11 18:37     ` Hilton Chain via Guix-patches via
2024-01-28  9:51   ` [bug#68524] [PATCH v2 2/2] gnu: bootloaders: Add uefi-uki-bootloader Lilah Tascheter via Guix-patches
2024-02-11 18:39     ` Hilton Chain via Guix-patches via
2024-02-13  2:11       ` Lilah Tascheter via Guix-patches
2024-02-13  7:34         ` Lilah Tascheter via Guix-patches
2024-02-14 18:02           ` Hilton Chain via Guix-patches via
2024-02-11 18:37   ` [bug#68524] [PATCH v2 0/2] Support root encryption and secure boot Hilton Chain via Guix-patches via
2024-02-20  1:08 ` [bug#68524] [PATCH " Nikolaos Chatzikonstantinou
2024-03-08  8:09 ` Lilah Tascheter via Guix-patches
2024-03-08 10:41 ` [bug#68524] Nikolaos Chatzikonstantinou
2024-03-23 19:40 ` [bug#68524] [PATCH 0/2] Support root encryption and secure boot Lilah Tascheter via Guix-patches
2024-03-24  9:38   ` Nikolaos Chatzikonstantinou
2024-07-29  5:11 ` [bug#68524] Fwd: " Ryan S via Guix-patches via
2024-08-15 13:14 ` [bug#68524] Rewrite Posted Lilah Tascheter via Guix-patches
2024-08-15 17:18   ` Nikolaos Chatzikonstantinou
2024-09-25 11:11 ` [bug#68524] [PATCH v3 0/5] Support root encryption and secure boot Herman Rimm via Guix-patches via
2024-09-25 11:11   ` [bug#68524] [PATCH v3 1/5] gnu: packages: Add pesign Herman Rimm via Guix-patches via
2024-09-25 11:12   ` Herman Rimm via Guix-patches via [this message]
2024-09-25 11:12   ` [bug#68524] [PATCH v3 3/5] gnu: packages: Add systemd-stub Herman Rimm via Guix-patches via
2024-09-25 11:12   ` [bug#68524] [PATCH v3 4/5] gnu: system: Fix bootloader crypto device recognition Herman Rimm via Guix-patches via
2024-09-25 11:12   ` [bug#68524] [PATCH v3 5/5] gnu: bootloaders: Add uki-efi-bootloader Herman Rimm via Guix-patches via
2024-10-18  5:47 ` [bug#68524] One problem with uki bootloader amano.kenji via Guix-patches via
2024-10-21 15:41 ` [bug#68524] Can uki be used with grub? amano.kenji via Guix-patches via

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

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4a8e3c9cef67f009b6fcb00739bdba3d46c2a2a6.1727262600.git.herman@rimm.ee \
    --to=guix-patches@gnu.org \
    --cc=68524@debbugs.gnu.org \
    --cc=efraim@flashner.co.il \
    --cc=herman@rimm.ee \
    --cc=lilah@lunabee.space \
    --cc=vagrant@debian.org \
    /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 public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).