me/guix
Archived
1
0
Fork 0
Code Activity

gnu: grub: Normalize indentation.

Browse source 
* gnu/packages/bootloaders.scm (grub): Re-indent package and remove trailing #t.
This commit is contained in:
Maxim Cournoyer 2022-12-01 11:26:07 -05:00
parent a3f638e748
commit 1a1a5aad2c
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 76 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/bootloaders.scm
View file

@ -118,16 +118,16 @@
(list "PYTHON=true") (list "PYTHON=true")
;; Grub fails to load modules stripped with --strip-unneeded. ;; Grub fails to load modules stripped with --strip-unneeded.
#:strip-flags '("--strip-debug" "--enable-deterministic-archives") #:strip-flags '("--strip-debug" "--enable-deterministic-archives")
#:phases (modify-phases %standard-phases #:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-stuff (add-after 'unpack 'patch-stuff
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
(substitute* "grub-core/Makefile.in" (substitute* "grub-core/Makefile.in"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
;; Give the absolute file name of 'mdadm', used to ;; Give the absolute file name of 'mdadm', used to determine the
;; determine the root file system when it's a RAID ;; root file system when it's a RAID device. Failing to do that,
;; device. Failing to do that, 'grub-probe' silently ;; 'grub-probe' silently fails if 'mdadm' is not in $PATH.
;; fails if 'mdadm' is not in $PATH.
(when (assoc-ref inputs "mdadm") (when (assoc-ref inputs "mdadm")
(substitute* "grub-core/osdep/linux/getroot.c" (substitute* "grub-core/osdep/linux/getroot.c"
(("argv\\[0\\] = \"mdadm\"") (("argv\\[0\\] = \"mdadm\"")
@ -148,9 +148,9 @@
(search-input-file inputs "/bin/ckbcomp") (search-input-file inputs "/bin/ckbcomp")
" "))))) " ")))))
(add-after 'unpack 'set-freetype-variables (add-after 'unpack 'set-freetype-variables
;; These variables need to be set to the native versions ;; These variables need to be set to the native versions of the
;; of the dependencies because they are used to build ;; dependencies because they are used to build programs which are
;; programs which are executed during build time. ;; executed during build time.
(lambda* (#:key native-inputs #:allow-other-keys) (lambda* (#:key native-inputs #:allow-other-keys)
(when (assoc-ref native-inputs "freetype") (when (assoc-ref native-inputs "freetype")
(let ((freetype (assoc-ref native-inputs "freetype"))) (let ((freetype (assoc-ref native-inputs "freetype")))
@ -159,24 +159,21 @@
"/lib -lfreetype")) "/lib -lfreetype"))
(setenv "BUILD_FREETYPE_CFLAGS" (setenv "BUILD_FREETYPE_CFLAGS"
(string-append "-I" freetype (string-append "-I" freetype
"/include/freetype2")))) "/include/freetype2"))))))
#t))
(add-before 'check 'disable-flaky-test (add-before 'check 'disable-flaky-test
(lambda _ (lambda _
;; This test is unreliable. For more information, see: ;; This test is unreliable. For more information, see:
;; <https://bugs.gnu.org/26936>. ;; <https://bugs.gnu.org/26936>.
(substitute* "Makefile.in" (substitute* "Makefile.in"
(("grub_cmd_date grub_cmd_set_date grub_cmd_sleep") (("grub_cmd_date grub_cmd_set_date grub_cmd_sleep")
"grub_cmd_date grub_cmd_sleep")) "grub_cmd_date grub_cmd_sleep"))))
#t))
(add-before 'check 'disable-pixel-perfect-test (add-before 'check 'disable-pixel-perfect-test
(lambda _ (lambda _
;; This test compares many screenshots rendered with an ;; This test compares many screenshots rendered with an older
;; older Unifont (9.0.06) than that packaged in Guix. ;; Unifont (9.0.06) than that packaged in Guix.
(substitute* "Makefile.in" (substitute* "Makefile.in"
(("test_unset grub_func_test") (("test_unset grub_func_test")
"test_unset")) "test_unset")))))
#t)))
;; Disable tests on ARM and AARCH64 platforms or when cross-compiling. ;; Disable tests on ARM and AARCH64 platforms or when cross-compiling.
#:tests? ,(not (or (any (cute string-prefix? <> (or (%current-target-system) #:tests? ,(not (or (any (cute string-prefix? <> (or (%current-target-system)
(%current-system))) (%current-system)))