[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: btrfs-progs: Install udev-rules.
From: |
guix-commits |
Subject: |
02/03: gnu: btrfs-progs: Install udev-rules. |
Date: |
Fri, 14 Feb 2020 17:05:03 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 0c26e43ecacb5885d4ea59dcc9b118db192f2828
Author: Brice Waegeneire <address@hidden>
AuthorDate: Sun Feb 9 10:38:42 2020 +0100
gnu: btrfs-progs: Install udev-rules.
* gnu/packages/linux.scm (btrfs-progs)[arguments]: Add phase
patch-makefile.
[native-inputs]: Add lvm2, eudev.
Signed-off-by: Ludovic Courtès <address@hidden>
---
gnu/packages/linux.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d1ce205..c5e27a0 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4037,6 +4037,13 @@ and copy/paste text in the console and in xterm.")
"static")) ; static versions of the binaries in "out"
(arguments
'(#:phases (modify-phases %standard-phases
+ (add-after 'unpack 'patch-makefile
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "Makefile"
+ (("\\$\\(DESTDIR\\)\\$\\(udevruledir\\)")
+ (string-append (assoc-ref outputs "out")
+ "/lib/udev/rules.d")))
+ #t))
(add-after 'build 'build-static
(lambda _ (invoke "make" "static")))
(add-after 'install 'install-bash-completion
@@ -4057,7 +4064,7 @@ and copy/paste text in the console and in xterm.")
#:tests? #f ; XXX: require the 'btrfs' kernel module.
#:test-target "test"
#:parallel-tests? #f)) ; tests fail when run in parallel
- (inputs `(("e2fsprogs" ,e2fsprogs)
+ (inputs `(("e2fsprogs" ,e2fsprogs) ; for btrfs-convert
("libblkid" ,util-linux)
("libblkid:static" ,util-linux "static")
("libuuid" ,util-linux)
@@ -4077,6 +4084,8 @@ and copy/paste text in the console and in xterm.")
;; For tests.
("acl" ,acl)
("which" ,which)
+ ("dmsetup" ,lvm2)
+ ("udevadm" ,eudev)
;; The tests need 'grep' with perl regexp support.
("grep" ,grep)))
(home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page")