diff mbox series

[bug#73202,v3,01/14] gnu: bootloader: Remove deprecated bootloader-configuration field.

Message ID 74c789e74594d538308d33633ed8540283dcde49.1727345067.git.herman@rimm.ee
State New
Headers show
Series [bug#73202,v3,01/14] gnu: bootloader: Remove deprecated bootloader-configuration field. | expand

Commit Message

Herman Rimm Sept. 26, 2024, 10:08 a.m. UTC 
From: Lilah Tascheter <lilah@lunabee.space>

* 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 mbox series

Patch

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* <bootloader>
 ;; The <bootloader-configuration> 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>
   bootloader-configuration make-bootloader-configuration
   bootloader-configuration?
   (bootloader
-   bootloader-configuration-bootloader) ;<bootloader>
+   bootloader-configuration-bootloader)   ;<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 <menu-entry>
   (default-entry         bootloader-configuration-default-entry
@@ -285,14 +274,9 @@  (define-record-type* <bootloader-configuration>
   (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 '().