From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 qEfqNGH8rmb+IgAA62LTzQ:P1 (envelope-from ) for ; Sun, 04 Aug 2024 03:58:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id qEfqNGH8rmb+IgAA62LTzQ (envelope-from ) for ; Sun, 04 Aug 2024 05:58:26 +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="jMWxXy/+"; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b="BoYLMgN/"; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=WvefqWvB; 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=1722743905; 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=2aWDOiQlK4fkB98ghWQOXhtQw/mZKhVwwRWghaq0/r0=; b=Sl8dLvMVFUWJDTm421Zwsf1FbuvZjpnBW0lcA9u8QDU452gXdhdTdQSN4T8y8Wmd8Gzspn fZ9XynitO2rHSpIV4cWfdzsDa7gDB9YZYL/+Eu0WbQpsDbm3aBZDi0FbXBie0A65KAQ2gf Kp7i15czOi6e4usw+2bPw419bLl7wDRR6WXdl0V1sdbR85PftObkRrURlYhMD8JR1xOmb2 Ys2qr+cE9sb1klKHVoetzgqtO/yvQ6rsp1bFuoztg7ZsKjugAL7k6hTgwzPI+FWPg5dTyx 2yDMROxlDww4JOhhtxFyNf9lJPHOUrr9tzma/xWnOLltfP86ypa1ualLAd8XXA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722743905; a=rsa-sha256; cv=none; b=Eh2DzScBkQ8L/CpCsCHxnmIinRkRROP3AqebO3ymjdCS3LbRSiAKO8lDdj05XbkjSH30kU PmHlfKuEMCWtV2CfxNQUSu0y12CJxNbOkWvxvz/Jd31p9ve83roZokXLk+QZDcp5eYdkCw Ab3Xpvf5JjnmslNSbIYNPx9onmKM5Wz3+dgfqSERzhTQfx9cRH4z1VVQv/dVEkID+UGllz 5yHxRANdPWWqwWK2BKnWOPZBb1Di0dLO7OM8xydm73djm9LVWT52Whrc2sqqZMddM9zQxM WrZQKqY7EOC1lXf/sL13m5YlbM88PAcg5jL4a/ZU9mflFABa9tK2ocH9exxKew== 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="jMWxXy/+"; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b="BoYLMgN/"; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=WvefqWvB; 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 AB17E64C31 for ; Sun, 4 Aug 2024 05:58:25 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1saSNN-0007k2-8L; Sat, 03 Aug 2024 23:57:45 -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 1saSNL-0007iw-38 for guix-patches@gnu.org; Sat, 03 Aug 2024 23:57:43 -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 1saSNK-0004Gz-Mq for guix-patches@gnu.org; Sat, 03 Aug 2024 23:57:42 -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=2aWDOiQlK4fkB98ghWQOXhtQw/mZKhVwwRWghaq0/r0=; b=jMWxXy/+PqG26xjARBGFLCIfMLGylREBBCKfAB/bMdcsIBhrxAboz4EFbxHY21wgGEg+pMlUlPxSKwZBMnrsb/ASo+3A0st1d1ymd0/WiLxvf0zXX4NzqRObKYevB/IiGYxkaiMJFjAWKWKvx6TLQUOtcS64nQWvKKsuIuQK2bePKbCBDdTZcnICV90PDO/XqKswXuGPYftSCnpsqi9My+rIUSX03sLbUaMgob5IfSJaIsiTwCf2wwLXq/TmfCzeYSmxt0miiwo7bg82gHUwcKQkcGanvScYTywwj/LSX5lqvNGXf8Yl1p/inwFKAv9u7NyOwzSc2m2KJKLhg1cD0A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1saSNe-0001OP-TK; Sat, 03 Aug 2024 23:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH 10/15] gnu: packages: Add systemd-stub. Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, lilah@lunabee.space, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 03:58:02 +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 , Efraim Flashner , Lilah Tascheter , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Lilah Tascheter , Vagrant Cascadian Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.17227438335139 (code B ref 72457); Sun, 04 Aug 2024 03:58:02 +0000 Received: (at 72457) by debbugs.gnu.org; 4 Aug 2024 03:57:13 +0000 Received: from localhost ([127.0.0.1]:55171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saSMq-0001Kl-JL for submit@debbugs.gnu.org; Sat, 03 Aug 2024 23:57:13 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:60944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saSMo-0001JN-7M for 72457@debbugs.gnu.org; Sat, 03 Aug 2024 23:57:11 -0400 DKIM-Signature: a=rsa-sha256; b=BoYLMgN/067AHkyyacIHB9PbDoqDhrMHO4aMzKX5Z+msBtAnzHYXIiyqEb9qqN0ovR8np3CNBxissVWaQ6jTqcqDhZACyF0Nwh4ccR/j+Yp0+dVO1Xy9Z1f1SEm6pGW0p9qQnLoGWlTtrMYJ2LRWKGRpiJcp2Y5vnlSo2xZnO+WxrcnO1b5dhgrJY3+shpfc5nvMyerK58DaxwsnKhnwN+ARYa9UrHAS/iNk2aRPJMg0O4lgB6H4/FMMxwgjnvsXTicirNx1dv2aLgibr1XcoLfNilvzCpMKtydnSLIrftlOXTyhOSNekYMP+SwC/R3itHfwRcu8NUnKvcHmREmSfQ==; s=purelymail2; d=lunabee.space; v=1; bh=wmKkk7rUZkor5i+2inBWd4u8VJNzpWntAePg8xBPUuk=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=WvefqWvBSbBO4cRA3YVzdWfcZtqk/ORIYKOOAeKX7cyCezx+UyFuz+8tjp7wvrW08sYiIfydt+Nyojj/yVqnHgpPc17+qdeBlqWcHt71lbr5913qVb7kroYmD88M61lSd/bFIhwAXmMeBnEAJL47IrIPq2tIeoipwcRzmYnkbSGOSOEcShp9KmM28w92OrfH51Wtvcq+MiS8Ji0k0OqmtUEXTnA4pj1DNx196Y+VcmkDNnFCQhDW2USVVOAwyqQjwXKlbwTAFfZFZ9v9yjL1zAaSrSnlsY/IwM3vZkWHcjea5AyJAo7H5PORkZDCmEwSAntxrEpxQsJikZegtXcbnw==; s=purelymail2; d=purelymail.com; v=1; bh=wmKkk7rUZkor5i+2inBWd4u8VJNzpWntAePg8xBPUuk=; 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 1753051598; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 04 Aug 2024 03:56:25 +0000 (UTC) Date: Sat, 3 Aug 2024 22:55:30 -0500 Message-ID: <618b4d4f364fbc2450df50380cbf457c5ac1e3aa.1722741997.git.lilah@lunabee.space> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail Content-Type: text/plain; charset=UTF-8 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: AB17E64C31 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.94 X-Spam-Score: -6.94 X-TUID: buzthTjgU9D6 * gnu/bootloader.scm (%efi-supported-systems, lazy-efibootmgr): New variabl= e. (install-efi): Use lazy-efibootmgr. * gnu/packages/bootloaders.scm (systemd-stub): New variable. Change-Id: I974bad9ff7a52f736286d05de53f7c5ccb60b9d6 --- gnu/bootloader.scm | 13 +++++++++-- gnu/packages/bootloaders.scm | 43 ++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index 2bb13437dc..27b0c51342 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -28,7 +28,6 @@ (define-module (gnu bootloader) #:autoload (gnu build file-systems) (read-partition-label read-partition-uuid find-partition-by-label find-partition-by-uuid) - #:use-module (gnu packages linux) #:use-module (gnu system file-systems) #:use-module (gnu system uuid) #:autoload (guix build syscalls) @@ -114,6 +113,7 @@ (define-module (gnu bootloader) bootloader-configuration->gexp bootloader-configurations->gexp =20 + %efi-supported-systems efi-arch install-efi)) =20 @@ -633,6 +633,11 @@ (define (bootloader-configurations->gexp bootloader-co= nfigs . rest) ;;; EFI shit ;;; =20 +;; systems currently supported by efi-arch. should be used for packages re= lying +;; on it. +(define %efi-supported-systems + '("i686-linux" "x86_64-linux" "armhf-linux" "aarch64-linux" "riscv64-lin= ux")) + (define* (efi-arch #:key (target (or (%current-target-system) (%current-sy= stem))) (32? #f)) "Returns the UEFI architecture name for the current target, in lowercase= ." @@ -644,6 +649,10 @@ (define* (efi-arch #:key (target (or (%current-target-= system) (%current-system)) (else (raise (formatted-message (G_ "no UEFI standard arch for ~a!= ") target))))) =20 +(define (lazy-efibootmgr) + "Lazy-loaded efibootmgr package, in order to prevent circular refs." + (module-ref (resolve-interface '(gnu packages linux)) 'efibootmgr)) + (define (install-efi bootloader-config plan) "Returns a gexp installing PLAN to the ESP, as denoted by the 'vendir ta= rget. PLAN is a gexp of a list of '(BUILDER DEST-BASENAME . LABEL) triples, that @@ -666,5 +675,5 @@ (define (install-efi bootloader-config plan) ;; normal install when not doing a removable config (with-targets targets (('vendir =3D> (vendir :path) (loader :devpath) (disk :device)) - #~(install-efi #+(file-append efibootmgr "/sbin/efibootmgr") + #~(install-efi #+(file-append (lazy-efibootmgr) "/sbin/efibootmgr= ") #$vendir #$loader #$disk #$plan)))))) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 04bb1b06f0..2bc04059d2 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -38,6 +38,7 @@ ;;; along with GNU Guix. If not, see . =20 (define-module (gnu packages bootloaders) + #:use-module (gnu bootloader) #:use-module (gnu packages) #:use-module (gnu packages assembly) #:use-module (gnu packages base) @@ -54,6 +55,7 @@ (define-module (gnu packages bootloaders) #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) + #:use-module (gnu packages gperf) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages man) @@ -592,6 +594,47 @@ (define systemd-source (base32 "1qdyw9g3jgvsbc1aryr11gpc3075w5pg00mqv4pyf3hwixxkwaq6")))) =20 +(define-public systemd-stub + (package + (name "systemd-stub") + (version systemd-version) + (source systemd-source) + (build-system meson-build-system) + (arguments + (list #:configure-flags + #~(list "-Dmode=3Drelease" "-Defi=3Dtrue" "-Dsbat-distro=3Dgui= x" + "-Dsbat-distro-generation=3D1" ; package revision! + "-Dsbat-distro-summary=3DGuix System" + "-Dsbat-distro-url=3Dhttps://guix.gnu.org" + #$(string-append "-Dsbat-distro-pkgname=3D" + (package-name this-package)) + #$(string-append "-Dsbat-distro-version=3D" + (package-version this-package))) + #:phases + ;; TODO: 32bit support + (let* ((stub (string-append + "src/boot/efi/linux" (efi-arch) ".efi.stub"))) + #~(modify-phases %standard-phases + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (invoke "ninja" #$stub + "-j" (if parallel-build? + (number->string (parallel-job-count)) "1"))= )) + (replace 'install + (lambda _ + (let ((libexec (string-append #$output "/libexec"))) + (install-file #$stub libexec)))) + (delete 'check))))) + (supported-systems %efi-supported-systems) + (inputs (list libcap python-pyelftools `(,util-linux "lib"))) + (native-inputs (list gperf pkg-config python-3 python-jinja2)) + (home-page "https://systemd.io/") + (synopsis "Unified kernel image UEFI stub") + (description "Simple UEFI boot stub that loads a conjoined kernel imag= e and +supporting data to their proper locations, before chainloading to the kern= el. +Supports measured and/or verified boot environments.") + (license license:lgpl2.1+))) + (define-public ukify (package (name "ukify") --=20 2.45.2