From 0c26e43ecacb5885d4ea59dcc9b118db192f2828 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 9 Feb 2020 10:38:42 +0100 Subject: gnu: btrfs-progs: Install udev-rules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (btrfs-progs)[arguments]: Add phase patch-makefile. [native-inputs]: Add lvm2, eudev. Signed-off-by: Ludovic Courtès --- 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 d1ce205194..c5e27a07db 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") -- cgit 1.4.1