From patchwork Sun Aug 4 18:06:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lilah Tascheter X-Patchwork-Id: 66694 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0EB9527BBE2; Sun, 4 Aug 2024 19:18:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7EB1427BBEA for ; Sun, 4 Aug 2024 19:18:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1safoF-0002Mj-7Q; Sun, 04 Aug 2024 14:18:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1safnf-00027C-8c for guix-patches@gnu.org; Sun, 04 Aug 2024 14:17:48 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1safne-0001r8-9K for guix-patches@gnu.org; Sun, 04 Aug 2024 14:17:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=buit2QYRv4t16LN+onkxKQtwHUEdrMneSRjlV7pxzDA=; b=I8+aa/kDeb0DWOZ5XBQbh1bEdDwpcKPNNyuucoKD0IKS+YBC4K6V9a6T/VNs0WfUDEBX/SOqzQXlaulRfgPHdDVRF/sXYIlaH0WX17xdJTFTpZ6WwIffrR0g2UA6UB5HM7IHFUpZOf6fZMcRVVjClH8iKFhpzmL0cue0XvcG08TXsquKFuJE5n2B5rqSpZ6J3nBM3VoBjPfEVsA3yuXQBSTJYbDxLzG5iqfkr4jHOXXGvKAsK24itXTV6R0WGh4/DcrqxhHLHarDYz7kxFvq/2rV/O5ZW/Y7Q2jt3oxEtNXOPVHgyN59Qji4JvXmlpUllqChpZpmFVLaujfvWhbKoQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1safnz-0006AG-Ik; Sun, 04 Aug 2024 14:18:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH v2 09/15] gnu: packages: Add ukify. Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 18:18:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72457 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72457@debbugs.gnu.org Cc: Lilah Tascheter , Tomas Volf <~@wolfsden.cz>, Sergey Trofimov , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.172279545723337 (code B ref 72457); Sun, 04 Aug 2024 18:18:07 +0000 Received: (at 72457) by debbugs.gnu.org; 4 Aug 2024 18:17:37 +0000 Received: from localhost ([127.0.0.1]:57174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1safnU-00064K-OC for submit@debbugs.gnu.org; Sun, 04 Aug 2024 14:17:37 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:36268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1safnS-00062z-55 for 72457@debbugs.gnu.org; Sun, 04 Aug 2024 14:17:35 -0400 Authentication-Results: purelymail.com; auth=pass DKIM-Signature: a=rsa-sha256; b=ApoOII3Yc/Vtq/oVoxiwxZd05BfKzxrjkzcgHzNKATyaB3/odJF1hce4jZNLYmLEYKKup5U6iVkMnSwTXmPOBK34eVwNd5H3wZDZ8iGcy+yZrb3yHwjP5t6nMZ+YPqDtVlZ6yMQRFZ2Qu3M9RKE2xR7Ryq+rzkz5vZkKOAojIhfP5q+uXLpZd2HnVfyj259W30pDXrqO3zN5qOTRjEKTu5zZAcShYPNTR6wVrHD9J7bcEC5/z79ngAbnYWIYZMmmHKw24QN2Chg1H/YekR7WBZ+lAcdI2OCf0900LeTmik2qWUHBKP1TsQ4MCq91I2wZ/P2LiOWNKrSPXVXpnwZOJw==; s=purelymail2; d=lunabee.space; v=1; bh=ct20D5UCkzcg79/PpAd07DbZyO28QekLcI9/1dbTTb8=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=WbXAoP11ix143bV+NjtjFVzg4NC5yM87vSBvIm6dVDHmYikW2LRhAI40kctsbSUp1js82MdoNB/BRNMBiumXvJVwDh9MNl7QJLuBEHvO125tRhBoDQg6rkTsP0BBbq2Z/k4TleAdwm2ASrL1Dbi/hVEfrijxEMmuAIF1qIplkbHv76/Xv3jyw9aDhQl4HlqW82K7dS5wTQOSDq6jhYi8Jh7R96Q2MpVFKTxtS8pM2t6TEkKjC3yiXMSgs1Dz/iR3L4jr6NXb4wgf6j57rNQcCU1EuwzWIgAhKrmiOfTiNOKqSK2Sk5CGZPXN7TGBR8gHEoMPi3JOSUJti8YFDMlCkg==; s=purelymail2; d=purelymail.com; v=1; bh=ct20D5UCkzcg79/PpAd07DbZyO28QekLcI9/1dbTTb8=; h=Feedback-ID:Received:From:To:Subject:Date; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: 72457@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1097091497; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 04 Aug 2024 18:16:49 +0000 (UTC) Date: Sun, 4 Aug 2024 13:06:08 -0500 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Lilah Tascheter via Guix-patches From: Lilah Tascheter Reply-To: Lilah Tascheter Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (systemd-version,systemd-source,ukify): New variables. Change-Id: Icde59b7266529c8002331ff0375e0a35af3a2add --- gnu/packages/bootloaders.scm | 54 ++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e78602379d..04bb1b06f0 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2023 Herman Rimm ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 Lilah Tascheter ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +48,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) @@ -73,11 +75,13 @@ (define-module (gnu packages bootloaders) #:use-module (gnu packages valgrind) #: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) @@ -573,6 +577,56 @@ (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))) + + (substitute* "src/ukify/ukify.py" ; hardcode tool paths + (("(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")