ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: bootloader: Remove deprecated bootloader-configuration field.

Browse source 
* 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
This commit is contained in:
Lilah Tascheter 2024-08-06 19:11:17 -05:00 committed by Ryan Schanzenbacher
parent a1de2abd8e
commit fa711c6979
Signed by: ryan77627
GPG key ID: 81B0E222A3E2308E
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/bootloader.scm
View file

@ -66,7 +66,6 @@ (define-module (gnu bootloader)
bootloader-configuration bootloader-configuration
bootloader-configuration? bootloader-configuration?
bootloader-configuration-bootloader bootloader-configuration-bootloader
bootloader-configuration-target ;deprecated
bootloader-configuration-targets bootloader-configuration-targets
bootloader-configuration-menu-entries bootloader-configuration-menu-entries
bootloader-configuration-default-entry bootloader-configuration-default-entry
@ -244,24 +243,14 @@ (define-record-type* <bootloader>
;; The <bootloader-configuration> record contains bootloader independant ;; The <bootloader-configuration> record contains bootloader independant
;; configuration used to fill bootloader configuration file. ;; 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> (define-record-type* <bootloader-configuration>
bootloader-configuration make-bootloader-configuration bootloader-configuration make-bootloader-configuration
bootloader-configuration? bootloader-configuration?
(bootloader (bootloader
bootloader-configuration-bootloader) ;<bootloader> bootloader-configuration-bootloader) ;<bootloader>
(targets %bootloader-configuration-targets (targets %bootloader-configuration-targets
(default #f)) ;list of strings (default #f)) ;list of strings
(target %bootloader-configuration-target ;deprecated
(default #f)
(sanitize warn-target-field-deprecation))
(menu-entries bootloader-configuration-menu-entries (menu-entries bootloader-configuration-menu-entries
(default '())) ;list of <menu-entry> (default '())) ;list of <menu-entry>
(default-entry bootloader-configuration-default-entry (default-entry bootloader-configuration-default-entry
@ -285,14 +274,9 @@ (define-record-type* <bootloader-configuration>
(extra-initrd bootloader-configuration-extra-initrd (extra-initrd bootloader-configuration-extra-initrd
(default #f))) ;string | #f (default #f))) ;string | #f
(define-deprecated (bootloader-configuration-target config)
bootloader-configuration-targets
(%bootloader-configuration-target config))
(define (bootloader-configuration-targets config) (define (bootloader-configuration-targets config)
(or (%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 ;; XXX: At least the GRUB installer (see (gnu bootloader grub)) has this
;; peculiar behavior of installing fonts and GRUB modules when DEVICE is #f, ;; peculiar behavior of installing fonts and GRUB modules when DEVICE is #f,
;; hence the default value of '(#f) rather than '(). ;; hence the default value of '(#f) rather than '().