--- Begin Message ---
Subject: |
[PATCH] gnu: btrfs-progs: Install udev-rules. |
Date: |
Sun, 9 Feb 2020 10:10:39 +0100 |
* gnu/packages/linux.scm (btrfs-progs)[arguments]: Add phase
patch-makefile.
[native-inputs]: Add lvm2, eudev.
---
gnu/packages/linux.scm | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 5535ddf86e..d83297283b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3971,6 +3971,12 @@ 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")))))
(add-after 'build 'build-static
(lambda _ (invoke "make" "static")))
(add-after 'install 'install-bash-completion
@@ -3991,7 +3997,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)
@@ -4011,6 +4017,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")
@@ -5042,6 +5050,15 @@ monitoring tools for Linux. These include
@code{mpstat}, @code{iostat},
(base32 "0zrjipd392bzjvxx0rjrb0cgi0ix1d83fwgw1mcy8kc4d16cgyjg"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
+ (arguments
+ `(#:make-flags (list "--with-udev")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "90-backlight.rules"
+ (("/bin/") "/run/current-system/profile/bin/"))
+ #t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)))
--
2.24.1
--- End Message ---
--- Begin Message ---
Subject: |
Re: [bug#39520] [PATCH] gnu: btrfs-progs: Install udev-rules. |
Date: |
Fri, 14 Feb 2020 22:59:28 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) |
Hi,
Brice Waegeneire <address@hidden> skribis:
> * gnu/packages/linux.scm (btrfs-progs)[arguments]: Add phase
> patch-makefile.
> [native-inputs]: Add lvm2, eudev.
[...]
> + (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")))))
I added a #t return here and committed.
Thanks!
Ludo’.
--- End Message ---