mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 23:46:13 -05:00
gnu: grub: Make dependency on mdadm explicit.
* gnu/packages/grub.scm (grub)[arguments]: Path getroot.c in 'patch-stuff' phase. [inputs]: Add MDADM.
This commit is contained in:
parent
ab2cc5cde1
commit
358db0041f
1 changed files with 13 additions and 2 deletions
|
@ -98,13 +98,23 @@ (define-public grub
|
|||
(arguments
|
||||
'(;; Two warnings: suggest braces, signed/unsigned comparison.
|
||||
#:configure-flags '("--disable-werror")
|
||||
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after
|
||||
'unpack 'patch-stuff
|
||||
(add-after 'unpack 'patch-stuff
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "grub-core/Makefile.in"
|
||||
(("/bin/sh") (which "sh")))
|
||||
|
||||
;; Give the absolute file name of 'mdadm', used to
|
||||
;; determine the root file system when it's a RAID
|
||||
;; device. Failing to do that, 'grub-probe' silently
|
||||
;; fails if 'mdadm' is not in $PATH.
|
||||
(substitute* "grub-core/osdep/linux/getroot.c"
|
||||
(("argv\\[0\\] = \"mdadm\"")
|
||||
(string-append "argv[0] = \""
|
||||
(assoc-ref inputs "mdadm")
|
||||
"/sbin/mdadm\"")))
|
||||
|
||||
;; Make the font visible.
|
||||
(copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
|
||||
(system* "gunzip" "unifont.bdf.gz")
|
||||
|
@ -118,6 +128,7 @@ (define-public grub
|
|||
#t)))))
|
||||
(inputs
|
||||
`(;; ("lvm2" ,lvm2)
|
||||
("mdadm" ,mdadm)
|
||||
("gettext" ,gnu-gettext)
|
||||
("freetype" ,freetype)
|
||||
;; ("libusb" ,libusb)
|
||||
|
|
Loading…
Reference in a new issue