From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 0JbpLF8C9GZPRAEA62LTzQ:P1 (envelope-from ) for ; Wed, 25 Sep 2024 12:30:23 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 0JbpLF8C9GZPRAEA62LTzQ (envelope-from ) for ; Wed, 25 Sep 2024 14:30:23 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="NNI/Wd0w"; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=KBgVzok9; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727267423; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=M1lwJO/NUYNPE/Gd/LXwO5X0spLJJIKvx/47QRR84Qg=; b=TE+GbLn93qjQ6Fgeow1+weNd1Fss6qUDOkQnSvsoU9tAMO6LIPQEkYVKnDXoKSNEdEVYIW TevbYc/GFCqlkTiNXlcrlOdEr9b6he/bV9vZ/vuBwdgWoHQIrKP5uS+F6hc2zKTT3XGsc3 MllbiIOeflFOr7bGmjuW24G7RGDoXjqb75YIQz1biDmZuUO6vtns61m1W/Vr6Izj87kppp yw2n5BRHkiUbvH+WBVppmPl2YA8pljS6ELS8xwUDwBHV0RwYsEH+Cw3o4pqapQjRhRjvcN uZI02FHF6WI6ZpjWw940qKjRAe6ozndiQQ9CGcsZrMvFXn+Nm7BJUmQHa9yI6A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727267423; a=rsa-sha256; cv=none; b=guliCvNvLw8QuyUUQU7oOwt8VKmBzOJb7VBjrpURO9mDCa1VIPzAN04EVaWi+qTyZi2Cbt MTfkvJF7UT4WXirA/AeGI/gpkRL3hEQazcv3ufJ3/CilRMo1rA7h/DOGkWqe43HVT+K9M9 YDm44bhckZhJPZoZ4d5VZAY1Rjd1DXBn6tR2CIDV7xU3pFW+yfrwxteU8CcKacBvICk+CG GwzGJIj8Gmk7PkfnG9s2ahFk7vZHp6xlv+jH/l2omy4E0JVT/mw/J5PrzDpCxreluEkv+i uituMSJ8NtZVdZ1m1gacDApe5IIIKx4F5NoTwx85TQEsZr/+Fq4m9NO6kDmx4Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="NNI/Wd0w"; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=KBgVzok9; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4F7436FBDF for ; Wed, 25 Sep 2024 14:30:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stQ4d-0004pW-IS; Wed, 25 Sep 2024 07:20:47 -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 1stQ4X-0004Qh-8s for guix-patches@gnu.org; Wed, 25 Sep 2024 07:20:41 -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 1stQ4W-0004yv-QD for guix-patches@gnu.org; Wed, 25 Sep 2024 07:20:40 -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=M1lwJO/NUYNPE/Gd/LXwO5X0spLJJIKvx/47QRR84Qg=; b=NNI/Wd0wEnWU5ajhh3znIbT6non0Ar97xF2EMDTSMdGAjtJQkQsMfQvN5X9x8UEVHlFl5zqwY8nSU8TbKW0rZqufDyGRdEQLyOI0I2ymzZypgUozqu+Y9DAq58tJ5NSgHJQT1xFFj7TNYUnyYGnqnhgwNKmjTgv6BpHFJYp9QYvSkGubq0vGlvDrNVfppbS4gCijZrShbP5KvqkoX8ymqcXRV1qwQSnr6LHIJ5O0Asg1VBo3pe3wSXKunMCLan+cmGuwPqIro1mxB4Ek2KOshU2npBOBdD9Uw64eSqwVFObStNe/rfrOom48waob0JQYfd5OVQ/uerjLC53183hO9g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stQ4t-0001dw-BP; Wed, 25 Sep 2024 07:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68524] [PATCH v3 2/5] gnu: packages: Add ukify. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Wed, 25 Sep 2024 11:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68524 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68524@debbugs.gnu.org Cc: Lilah Tascheter , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 68524-submit@debbugs.gnu.org id=B68524.17272632255697 (code B ref 68524); Wed, 25 Sep 2024 11:21:03 +0000 Received: (at 68524) by debbugs.gnu.org; 25 Sep 2024 11:20:25 +0000 Received: from localhost ([127.0.0.1]:57489 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stQ4F-0001Tc-Mf for submit@debbugs.gnu.org; Wed, 25 Sep 2024 07:20:25 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:50673 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stQ4D-0001Sq-FV for 68524@debbugs.gnu.org; Wed, 25 Sep 2024 07:20:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1727262781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M1lwJO/NUYNPE/Gd/LXwO5X0spLJJIKvx/47QRR84Qg=; b=KBgVzok9heGE+BBEbspsO+M/QbMej02+Zs+lK3qtluON6WMu5LTAixjbLdcNNjq9N9ErP3 yI5ljA8+YQqSeN8zhsgQ8rw/N+Et0xkef9QPFKsKPEJh5X3TbZe3P9+MeNc6CKCCFTiF5B DQP1ihv5svJDcxh8Y99LLZNdUyrXFGFK/cWDLVigFTtpQN1R7VwDYeHSo08idUmblNxuKm fBKXAzKgC6s/e2nUwV5vvXE35FvR9AwQ+I8QdlPvuZbOmExdnqoIja43xRnrdwNlW1r5uD QgdsUlGEhmDOrZWrDYmhofCUiKx96AiO5fLUpCjrmYG9oZxPPBSHsclPiN0p2w== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 21fef9cf (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 25 Sep 2024 11:13:01 +0000 (UTC) Date: Wed, 25 Sep 2024 13:12:00 +0200 Message-ID: <4a8e3c9cef67f009b6fcb00739bdba3d46c2a2a6.1727262600.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.91 X-Spam-Score: -4.91 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Queue-Id: 4F7436FBDF X-TUID: rAs/tH3W0TC1 From: Lilah Tascheter * 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 ;;; Copyright © 2023 Simon Tournier ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 Lilah Tascheter ;;; ;;; 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