From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:54226) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j0icJ-0006kX-Gg for guix-patches@gnu.org; Sun, 09 Feb 2020 04:11:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j0icI-0001LF-FF for guix-patches@gnu.org; Sun, 09 Feb 2020 04:11:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46057) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j0icI-0001L9-CR for guix-patches@gnu.org; Sun, 09 Feb 2020 04:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j0icI-0000qi-8m for guix-patches@gnu.org; Sun, 09 Feb 2020 04:11:02 -0500 Subject: [bug#39520] [PATCH] gnu: btrfs-progs: Install udev-rules. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:54199) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j0ic2-0006kM-L9 for guix-patches@gnu.org; Sun, 09 Feb 2020 04:10:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j0ic1-000184-H1 for guix-patches@gnu.org; Sun, 09 Feb 2020 04:10:46 -0500 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:55907) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j0ic1-000122-BD for guix-patches@gnu.org; Sun, 09 Feb 2020 04:10:45 -0500 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 1C0721C0005 for ; Sun, 9 Feb 2020 09:10:41 +0000 (UTC) From: Brice Waegeneire Date: Sun, 9 Feb 2020 10:10:39 +0100 Message-Id: <20200209091039.28594-1-brice@waegenei.re> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39520@debbugs.gnu.org * 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