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

gnu: multipath-tools: Set prefix instead of DESTDIR.

Browse source 
This is necessary to avoid having multipath look for its plugins in /lib
instead of /gnu/store/...-multipath-tools-.../lib.

* gnu/packages/linux.scm (multipath-tools)[arguments]: Replace DESTDIR with
prefix in make flags; override configdir to look up stateful configurations in
global /etc directory.
This commit is contained in:
Ricardo Wurmus 2022-11-14 22:50:27 +01:00
parent a570b4e1ee
commit 2a58ddb6da
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/linux.scm
View file

@ -5203,7 +5203,7 @@ (define-public multipath-tools
(list (list
#:test-target "test" #:test-target "test"
#:make-flags #~(list (string-append "CC=" #$(cc-for-target)) #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
(string-append "DESTDIR=" #$output) (string-append "prefix=" #$output)
;; Install Udev rules below this directory, relative ;; Install Udev rules below this directory, relative
;; to the prefix. ;; to the prefix.
"SYSTEMDPATH=lib") "SYSTEMDPATH=lib")
@ -5218,6 +5218,8 @@ (define-public multipath-tools
(substitute* "Makefile.inc" (substitute* "Makefile.inc"
(("/bin/echo") "echo") (("/bin/echo") "echo")
(("\\$\\(prefix\\)/usr") "$(prefix)") (("\\$\\(prefix\\)/usr") "$(prefix)")
(("configdir.*:= \\$\\(prefix\\)/etc/multipath/conf.d")
"configdir := /etc/multipath/conf.d")
;; Do not save timestamp to avoid gzip "timestamp ;; Do not save timestamp to avoid gzip "timestamp
;; out-of-range" warnings. ;; out-of-range" warnings.
(("gzip -9") "gzip -9n")) (("gzip -9") "gzip -9n"))