From fa711c6979f734dd6744a9ee032cea9fcb3af591 Mon Sep 17 00:00:00 2001 From: Lilah Tascheter Date: Tue, 6 Aug 2024 19:11:17 -0500 Subject: [PATCH] gnu: bootloader: Remove deprecated bootloader-configuration field. * 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(-) 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 '().