From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 2LfqBxHmr2aqUwAAqHPOHw:P1 (envelope-from ) for ; Sun, 04 Aug 2024 20:35:29 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 2LfqBxHmr2aqUwAAqHPOHw (envelope-from ) for ; Sun, 04 Aug 2024 22:35:29 +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=u+AeDiPz; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=FeLVxnqn; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=XJA8qR2K; 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=1722803728; 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=yjkjBg9EvQRyeREsXnnhnabKxhwneIGQpGbtyyVlBXE=; b=JU4igQof7cjWTqVxjwOO+ams9fEsOXfqaNbjAvKhXz8+ZmKdec1uzAmWFubmeSYThXezzy N+nKRT0GHEssSm4T0RI81W4zf8k+lkIZk9OY9zcs054Fjq1/QXw+TljiipWZKCQd2d/8qI J1vC8eF3ktfAgQQ6XMQSaekhHFqmzrX4n3FPPQ8pBoWsoO7CLNwFSkM1/AoJMM+BvnfrNs xvwhUh2E0/U4whfmBwMy7S9fUu5N62cxg+JaGpoALf/L60r/AzbO5iH2qfi8L7bx8d53xV U9yI0jG76RLKB2aUQe15QnFzRgfaPu3sD3j1YF6xDehthWUPhlayrNG87c8vpA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722803728; a=rsa-sha256; cv=none; b=S4S/FWr6KGnDAAibgpC6J9MrRTwmK87XlWZtMWqmbhQ4xPqY2+mfr4e6Gr8nOrO0lCqMOJ bReJSBCP1pfqJlV+DP4Fu7NaX2Y9DeTST2wSun+M5Kuf1D4XPH3kPSfsbaA+fpZwKXfWc4 UdOrYX2oab8ZIaJFW/iP2WuKy41lJ2Gqcj0z35jniIWTa1HjyJkwc07dc1aINSYf9r0OO5 V1eeX2ArCnbUjyGpRhBOJP47umpAbLhbHTPsI2Dly2NpEopNJBD79INGuk/HA4u6GU1md8 MKRlX6zbDCFN5tJEAEoP6dUHwtRlDhJym4Lm8RBPVK4VyE/Wf3L13qj0PwLlyQ== 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=u+AeDiPz; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=FeLVxnqn; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=XJA8qR2K; 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 C8B0C10DE4 for ; Sun, 4 Aug 2024 22:35:28 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sahwF-0002IQ-AV; Sun, 04 Aug 2024 16:34: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 1sahwE-0002Hg-Am for guix-patches@gnu.org; Sun, 04 Aug 2024 16:34:46 -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 1sahwE-0008L2-1J for guix-patches@gnu.org; Sun, 04 Aug 2024 16:34: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=yjkjBg9EvQRyeREsXnnhnabKxhwneIGQpGbtyyVlBXE=; b=u+AeDiPzfkQIJcyo8X8rE9Bv0jogwVBo8XAUTovDtt+PDq4Qr3rD+o7gTW017uwNB3H8PqNgZNIBiLr/Voxp9uycnH6wDlQDjgIrTaagH7wR2//qAEYHKizkg4logBAIXhxgT+lJ9nVTMwnqr7k17C/yj5MufB39YCtIDCoVOFOMzWGRqiL+4kWXU2cFo0whRqYtxJUDPUYZg2OnK+MpTdJ1Oik3fvsn1Zzl1JH5YTVxRxg7+W9YL50krhZu4E3BZl/Odv/phS0QgZAuHMZFTM0kZBhjh8ipodJ5LvQOYI8qjXG+j9MT0Ddrfkg3EsPdRSUeROEa14MbTO3mK6bp6g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sahwZ-0006PY-EN; Sun, 04 Aug 2024 16:35:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH v3 11/15] gnu: bootloaders: Add uki-efi-bootloader. Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: lilah@lunabee.space, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 20:35: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 , Sergey Trofimov , Lilah Tascheter X-Debbugs-Original-Xcc: Lilah Tascheter Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.172280367124364 (code B ref 72457); Sun, 04 Aug 2024 20:35:07 +0000 Received: (at 72457) by debbugs.gnu.org; 4 Aug 2024 20:34:31 +0000 Received: from localhost ([127.0.0.1]:57373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sahvy-0006Ks-Do for submit@debbugs.gnu.org; Sun, 04 Aug 2024 16:34:31 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:35068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sahvv-0006JW-Ad for 72457@debbugs.gnu.org; Sun, 04 Aug 2024 16:34:28 -0400 DKIM-Signature: a=rsa-sha256; b=FeLVxnqn7G7Mvy2k9tYjon2e6Ac+kyXWWZEPJto9MjlUK/9nPLGMKEBEYNrZSrkp3dZ3JJmIi3UqoDDhSTip7BcX5JPMxLGpRZMqJTncHv67bhxqG9IfOXsroVjaonc7ps0rLqmONFbSQAIL/JKfOYOUMkHAtl/T/F/P37PadJlXmINAnmWqO5A94TuUrMe3RO41VowjtaAWiCxHRvN+cU6RSdzSNB6Kor5RW9mjKRT5ROVDn1tqDBrB9uJiTk+idXqs3ijAnr8Tjk6QPnqAUWro0qQTRGo+LJbmuJG23TvDorIvdWfrqoOvijGV4ldiWR/eAWmCKVCo5bEftx/W+g==; s=purelymail2; d=lunabee.space; v=1; bh=R3jVpSsbbPWvhSSYihcgvobtQAt+LPdmAHaZEbugUq8=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=XJA8qR2Kq5gGBZmpqU62YDNKklR/Frx+EuzYTwt3sFVFVAlA85N7igDb0sq1nd7DcAlNrMpzWHZJEp6+H3vtjty5ANboFwyA8EjSg5KNbHdOLAoEhuZIpiupgG1/cpqXsRUu5tTj9LwjvJlTH4ZeuD+7N36M9EDqS6fwxWbrv3RFUqP5Nr1wmlQ5sU1Lkhx8xz4YX9SHfU15KrGHoSqmk1WkYiisW8o+7ca4XkXdWcTs1ojI/XCUqtoyWQuRlbNLaWzE7/AXsBSi1jXcjdQez+OSzFkwZQ8a9Kdbhz2KZh+SwNJhYYDiLPAg+ucqyNeoiiOxOkMVcWns0GuyftSong==; s=purelymail2; d=purelymail.com; v=1; bh=R3jVpSsbbPWvhSSYihcgvobtQAt+LPdmAHaZEbugUq8=; 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 -1317130453; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 04 Aug 2024 20:33:42 +0000 (UTC) Date: Sun, 4 Aug 2024 15:31:57 -0500 Message-ID: <4c3fcd5b3a2b5c5d5ff2dd74f79492dfaac370f2.1722803521.git.lilah@lunabee.space> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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: , From: Lilah Tascheter via Guix-patches Reply-To: Lilah Tascheter Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: C8B0C10DE4 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.94 X-Spam-Score: -6.94 X-TUID: i/klJAhTy61A * gnu/bootloader.scm (): New keypair field. * gnu/bootloader/uki.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add bootloader/uki.scm. Change-Id: I2097da9f3dd35137b3419f6d0545de26d53cb6da --- gnu/bootloader.scm | 3 ++ gnu/bootloader/uki.scm | 96 ++++++++++++++++++++++++++++++++++++++++++ gnu/local.mk | 1 + 3 files changed, 100 insertions(+) create mode 100644 gnu/bootloader/uki.scm diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index 6d1ecd9f00..b8116339ab 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -101,6 +101,7 @@ (define-module (gnu bootloader) bootloader-configuration-default-entry bootloader-configuration-efi-removable? bootloader-configuration-32bit? + bootloader-configuration-keypair bootloader-configuration-timeout bootloader-configuration-keyboard-layout bootloader-configuration-theme @@ -524,6 +525,8 @@ (define-record-type* (default #f)) ;bool (32bit? bootloader-configuration-32bit? (default #f)) ;bool + (keypair bootloader-configuration-keypair + (default #f)) ;(cert . priv) pair (timeout bootloader-configuration-timeout (default 5)) ;seconds as integer (keyboard-layout bootloader-configuration-keyboard-layout diff --git a/gnu/bootloader/uki.scm b/gnu/bootloader/uki.scm new file mode 100644 index 0000000000..4871dbe037 --- /dev/null +++ b/gnu/bootloader/uki.scm @@ -0,0 +1,96 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2024 Lilah Tascheter +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu bootloader uki) + #:use-module (gnu bootloader) + #:use-module (gnu packages bootloaders) + #:use-module (gnu packages efi) + #:use-module (gnu packages linux) + #:use-module (gnu system boot) + #:use-module (guix gexp) + #:use-module (guix diagnostics) + #:use-module (guix i18n) + #:use-module (guix records) + #:export (uki-efi-bootloader)) + +;; TODO: support 32bit/mixed-mode UEFI. +;; https://github.com/systemd/systemd/issues/17056 may be relevant +(define bootcfg->menu-entry->builder + (match-record-lambda (32bit? theme keypair) + (match-record-lambda + (label linux linux-arguments initrd chain-loader) + ;; support chainloader in order to allow arbitrary signed EFI binari= es + (cond + ((and chain-loader keypair) + #~(lambda (dest) + (invoke/quiet #+(sbsigntools "/bin/sbsign") + "--cert" #$(car keypair) "--key" #$(cdr keypair) + "--output" dest #$chain-loader) + (invoke/quiet #+(sbsigntools "/bin/sbverify") + "--cert" #$(car keypair) dest))) + (chain-loader #~(lambda (dest) (copy-file #$chain-loader dest))) + (linux + (let* ((arch (efi-arch #:32? 32bit?)) + (stub (file-append systemd-stub + "/libexec/linux" arch ".efi.stub"))) + #~(lambda (dest) + (invoke/quiet #+(file-append ukify "/bin/ukify") + "build" "--output" dest + "--linux" #$linux "--initrd" #$initrd + "--cmdline" (string-join (list #$@linux-arguments)) + "--os-release" #$label "--stub" #$stub "--efi-arch" #$ar= ch + #$@(if theme #~("--splash" #$theme) '()) + #$@(if keypair #~("--secureboot-certificate" #$(car keyp= air) + "--secureboot-private-key" #$(cdr keyp= air)) + '()))))) + (else (leave (G_ "uki-efi-bootloader doesn't support multiboot")))= )))) + +;; we cannot use guix's build system to make UKI images for two reasons: +;; 1. signing is necessarily non-reproducable, especially since keys shoul= d not +;; be in the store, or else risk being publically accessible. +;; 2. menu-entries may reference files which do not exist in the store. +(define* (install-uki #:key bootloader-config + current-boot-alternative + old-boot-alternatives + #:allow-other-keys) + (define* (menu-entry->plan entry num #:optional (prefix "menu-entry")) + #~(cons* #$((bootcfg->menu-entry->builder bootloader-config) entry) + #$(string-append prefix "-" (number->string num) ".efi") + #$(menu-entry-label entry))) + + (define (boot-alternative->plan alt) + (menu-entry->plan (boot-alternative->menu-entry alt) + (boot-alternative-generation alt) + "generation")) + + (install-efi bootloader-config + (let ((entries (bootloader-configuration-menu-entries bootloader-confi= g))) + #~(list #$(boot-alternative->plan current-boot-alternative) + #$@(map menu-entry->plan entries (iota (length entries))) + #$@(map boot-alternative->plan old-boot-alternatives))))) + + + +(define uki-efi-bootloader + (bootloader + (name 'uki-efi) + (default-targets (list (bootloader-target + (type 'vendir) + (offset 'esp) + (path "EFI/Guix")))) + (installer install-uki))) diff --git a/gnu/local.mk b/gnu/local.mk index 8375e13709..32ed753ee2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -93,6 +93,7 @@ GNU_SYSTEM_MODULES =3D=09=09=09=09\ %D%/bootloader/extlinux.scm \ %D%/bootloader/u-boot.scm \ %D%/bootloader/depthcharge.scm \ + %D%/bootloader/uki.scm \ %D%/ci.scm=09=09=09=09=09\ %D%/compression.scm=09=09=09=09\ %D%/home.scm=09=09=09=09=09\ --=20 2.45.2