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
|
@ -98,13 +98,23 @@
|
||||||
(arguments
|
(arguments
|
||||||
'(;; Two warnings: suggest braces, signed/unsigned comparison.
|
'(;; Two warnings: suggest braces, signed/unsigned comparison.
|
||||||
#:configure-flags '("--disable-werror")
|
#:configure-flags '("--disable-werror")
|
||||||
|
|
||||||
#:phases (modify-phases %standard-phases
|
#:phases (modify-phases %standard-phases
|
||||||
(add-after
|
(add-after 'unpack 'patch-stuff
|
||||||
'unpack 'patch-stuff
|
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key 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
|
||||||
|
;; 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.
|
;; Make the font visible.
|
||||||
(copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
|
(copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
|
||||||
(system* "gunzip" "unifont.bdf.gz")
|
(system* "gunzip" "unifont.bdf.gz")
|
||||||
|
@ -118,6 +128,7 @@
|
||||||
#t)))))
|
#t)))))
|
||||||
(inputs
|
(inputs
|
||||||
`(;; ("lvm2" ,lvm2)
|
`(;; ("lvm2" ,lvm2)
|
||||||
|
("mdadm" ,mdadm)
|
||||||
("gettext" ,gnu-gettext)
|
("gettext" ,gnu-gettext)
|
||||||
("freetype" ,freetype)
|
("freetype" ,freetype)
|
||||||
;; ("libusb" ,libusb)
|
;; ("libusb" ,libusb)
|
||||||
|
|
Loading…
Reference in New Issue