From patchwork Thu Sep 26 10:09:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 31495 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 07B3627BBEA; Thu, 26 Sep 2024 11:12:22 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 B6DE927BBE2 for ; Thu, 26 Sep 2024 11:12:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stlTN-00030z-HJ; Thu, 26 Sep 2024 06:11: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 1stlTJ-0002z1-Bt for guix-patches@gnu.org; Thu, 26 Sep 2024 06:11: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 1stlTJ-0007Qj-1b for guix-patches@gnu.org; Thu, 26 Sep 2024 06:11:41 -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=qRkQ+V7cbQqvpp4N1OyLrTv06n5MQwiFsnRDUcaJYXA=; b=iEmKUbfzu7ddTEf/uxvltazO1+C1jUim1m8FJHDbnWxFozIbWo93dHHbDsL9oGAqrkJgYukaY57y9z9gXDVwXRd7NaZKAJQiytXAMffpw6Mg/02NMHrrS8qAGfGCbGkLMHJe4v/JGePQUyAFDuyRZUiNHHytrotkx5/j4B5yX59PZvIWYEPI2rz6nuFLZb146x+xNOQ/8XwuapLYyVuYKg0eLQJo6RZpuVFDVIlFBg0iqxPfGYTqYrCRGrDyWUBVwikq9bScRcMb/k9Oyou6LRBIoRKHkN40kYLZWWH3wnn86ZvaGP9TcpjnMCk9b+BPWXyW5/G0mKDj2rk4NbVdcw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stlTj-0003Va-Um; Thu, 26 Sep 2024 06:12:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73202] [PATCH v3 13/14] gnu: bootloader: Match records outside the module. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: lilah@lunabee.space, guix-patches@gnu.org Resent-Date: Thu, 26 Sep 2024 10:12:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73202 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73202@debbugs.gnu.org Cc: Lilah Tascheter X-Debbugs-Original-Xcc: Lilah Tascheter Received: via spool by 73202-submit@debbugs.gnu.org id=B73202.172734551013336 (code B ref 73202); Thu, 26 Sep 2024 10:12:07 +0000 Received: (at 73202) by debbugs.gnu.org; 26 Sep 2024 10:11:50 +0000 Received: from localhost ([127.0.0.1]:55506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stlTP-0003Ss-1z for submit@debbugs.gnu.org; Thu, 26 Sep 2024 06:11:50 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:36821 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stlT2-0003Q9-NC for 73202@debbugs.gnu.org; Thu, 26 Sep 2024 06:11:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1727345443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MGXJGMlBS2JxeQ9UHG5y4t5h/ac6O9cs+W8GkavSdxg=; b=Wgf78P0DG+HMYyj7x6MBKHBsb+fbJMpySIJkRY9i6ugSHPWkp4aWdVAxUuYyCHdwbz2WUx C1ZB6SY4YC8KkFf35UwtjwuU7OL8KE+cMVxj0nHgZ7KYYBvQQ40gT+e7iYyll+33AB9Et4 kTwA46rWcraRpmoKv9L5TYhCkBxApkhO+WsHSgQwN9ub8VaYWldJU8scggprW98sDLL8eN BPXKf2YJlXE7DLPLDBY+ryIh4ai/xuUW3ZyAzLyeAMtGQ1rtwuQRfrCZ0bKYHWuSDsC+T1 T6NS7b20gfidsveq/PQox9h6DkKBRx53IAwd7tfI1Ur6dFqbEu43/HbI3qaMvw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 2f74c9e7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <73202@debbugs.gnu.org>; Thu, 26 Sep 2024 10:10:43 +0000 (UTC) Date: Thu, 26 Sep 2024 12:09:10 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <74c789e74594d538308d33633ed8540283dcde49.1727345067.git.herman@rimm.ee> References: <74c789e74594d538308d33633ed8540283dcde49.1727345067.git.herman@rimm.ee> MIME-Version: 1.0 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 X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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/bootloader.scm (match-bootloader-configuration, match-menu-entry): Add macros. Change-Id: I42cb7541045314c37ffef98fe6efe7f46acd9d9b --- gnu/bootloader.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index 6b08e61492..b1ed187aa2 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2022 Reza Alizadeh Majd ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> ;;; Copyright © 2024 Lilah Tascheter +;;; Copyright © 2024 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -115,6 +116,9 @@ (define-module (gnu bootloader) bootloader-configuration->gexp bootloader-configurations->gexp + match-bootloader-configuration + match-menu-entry + %efi-supported-systems efi-arch install-efi @@ -642,6 +646,20 @@ (define (bootloader-configurations->gexp bootloader-configs . rest) (apply gbegin (filter-map (cut apply bootloader-configuration->gexp <> rest) bootloader-configs))) +;; In lieu of exporting bootloader-configuration and menu-entry RTDs. +(define-syntax match-bootloader-configuration + (syntax-rules () + "Bind each BOOTLOADER-CONFIGURATION field in FIELDS." + ((_ bootloader-configuration (fields ...) body ...) + (match-record bootloader-configuration + (fields ...) body ...)))) + +(define-syntax match-menu-entry + (syntax-rules () + "Bind each MENU-ENTRY field in FIELDS." + ((_ menu-entry (fields ...) body ...) + (match-record menu-entry (fields ...) body ...)))) + ;;; ;;; Bootloader installation to ESP.