From patchwork Thu Sep 26 10:08:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 31493 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 C43E027BBEB; Thu, 26 Sep 2024 11:12:10 +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=unavailable 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 C662827BBE2 for ; Thu, 26 Sep 2024 11:12:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stlTF-0002wx-2i; Thu, 26 Sep 2024 06:11:37 -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 1stlTD-0002wJ-Q0 for guix-patches@gnu.org; Thu, 26 Sep 2024 06:11:35 -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 1stlTD-0007P6-Gh for guix-patches@gnu.org; Thu, 26 Sep 2024 06:11:35 -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:Date:From:To:In-Reply-To:References:Subject; bh=jrFz+Po8w18tytchy7+aNDboMOw/I/Oi+JJ7tveG/1k=; b=sYNu21iXLyBn6BrAWHPhmdR/rv09Nummu0XNzn4ublgEsnqft+3ZF2yLTq/NFyVCgVKtbI08jijdFUjsekREYsSvaMQrR1vRx1RUEIwrJ8ASVGXMgqVSGJO2fsruSj3hXyyWGnqSgtnjTIM4fx409ytJS3drsuS8CZzH90e6WcHd+ihjGWsQ25somtOSwlj5SmtWsX/RPTOVWedUm0JVeNknNRRdkcdeJCHD+G46fvYJsE8NOBvHK3EolVO+5h9hmfS8SRgyB7IWQyqqGQd70kybCBGlrDfs7kpR4HzUbMN5IJoByw582jeEp+U9NTKD4FGMwqw+oy/sWF8yrRUG4g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stlTe-0003Tp-E7; Thu, 26 Sep 2024 06:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73202] [PATCH v3 01/14] gnu: bootloader: Remove deprecated bootloader-configuration field. References: <20240912165818.21580-1-herman@rimm.ee> In-Reply-To: <20240912165818.21580-1-herman@rimm.ee> 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:02 +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 , Lilah Tascheter X-Debbugs-Original-Xcc: Lilah Tascheter Received: via spool by 73202-submit@debbugs.gnu.org id=B73202.172734547713133 (code B ref 73202); Thu, 26 Sep 2024 10:12:02 +0000 Received: (at 73202) by debbugs.gnu.org; 26 Sep 2024 10:11:17 +0000 Received: from localhost ([127.0.0.1]:55462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stlSv-0003Pb-65 for submit@debbugs.gnu.org; Thu, 26 Sep 2024 06:11:17 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39475 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stlSt-0003PA-2M for 73202@debbugs.gnu.org; Thu, 26 Sep 2024 06:11:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1727345434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jrFz+Po8w18tytchy7+aNDboMOw/I/Oi+JJ7tveG/1k=; b=jGIrM9kqkitygQ0qtlWM75n2MmXzYgdUh/9TgmchtsPOpEgYxED7647OnkPRumg15xS/Wt MAeRBT4NZrhPsmK9aUQ4TKQMxYeOftJur0BvQ3E9cR8lbmBZqvnmT52eVdowhXAUdNjur4 8jnAJ6cH8uOkBeBKnN769ekoNLJwqfi40PC6nBek7Q0Ka4TsTpHLuVBt3zJ2wd3mW61qnj B15V/8yr6DmOuKo6cgbRVgjsG6CFVI8UZHZvNxauIMmk7pBExxiVSqux//55Itsl06sd4/ 0+LLxVzc7dCCOKK+MnRiphF1fkS4afrEwwcTd4FQLBzCMdRDRLm6cmmEmDQwEA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 785e15c2 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 26 Sep 2024 10:10:34 +0000 (UTC) Date: Thu, 26 Sep 2024 12:08:58 +0200 Message-ID: <74c789e74594d538308d33633ed8540283dcde49.1727345067.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 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 From: Lilah Tascheter * gnu/bootloader.scm (warn-target-field-deprecation): Delete sanitizer. (bootloader-configuration)[target]: Remove deprecated field. (bootloader-configuration-target): Delete procedure. (bootloader-configuration-targets): Do not use target field. Change-Id: I3654d160f7306bb45a78b82ea6b249ff4281f739 --- gnu/bootloader.scm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) base-commit: db3ec7f65bd04741f1d97a9a3bbd3d96f12caa52 diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index f32e90e79d..865521e6e5 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -66,7 +66,6 @@ (define-module (gnu bootloader) bootloader-configuration bootloader-configuration? bootloader-configuration-bootloader - bootloader-configuration-target ;deprecated bootloader-configuration-targets bootloader-configuration-menu-entries bootloader-configuration-default-entry @@ -244,24 +243,14 @@ (define-record-type* ;; The record contains bootloader independant ;; configuration used to fill bootloader configuration file. -(define-with-syntax-properties (warn-target-field-deprecation - (value properties)) - (when value - (warning (source-properties->location properties) - (G_ "the 'target' field is deprecated, please use 'targets' \ -instead~%"))) - value) (define-record-type* bootloader-configuration make-bootloader-configuration bootloader-configuration? (bootloader - bootloader-configuration-bootloader) ; + bootloader-configuration-bootloader) ; (targets %bootloader-configuration-targets (default #f)) ;list of strings - (target %bootloader-configuration-target ;deprecated - (default #f) - (sanitize warn-target-field-deprecation)) (menu-entries bootloader-configuration-menu-entries (default '())) ;list of (default-entry bootloader-configuration-default-entry @@ -285,14 +274,9 @@ (define-record-type* (extra-initrd bootloader-configuration-extra-initrd (default #f))) ;string | #f -(define-deprecated (bootloader-configuration-target config) - bootloader-configuration-targets - (%bootloader-configuration-target config)) (define (bootloader-configuration-targets config) (or (%bootloader-configuration-targets config) - ;; TODO: Remove after the deprecated 'target' field is removed. - (list (%bootloader-configuration-target config)) ;; XXX: At least the GRUB installer (see (gnu bootloader grub)) has this ;; peculiar behavior of installing fonts and GRUB modules when DEVICE is #f, ;; hence the default value of '(#f) rather than '().