From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:56327) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j0j3P-0007ii-V5 for guix-patches@gnu.org; Sun, 09 Feb 2020 04:39:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j0j3O-0000hc-KZ for guix-patches@gnu.org; Sun, 09 Feb 2020 04:39:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46097) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j0j3O-0000hY-HY for guix-patches@gnu.org; Sun, 09 Feb 2020 04:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j0j3O-0001ae-E6 for guix-patches@gnu.org; Sun, 09 Feb 2020 04:39:02 -0500 Subject: [bug#39520] [PATCH] gnu: btrfs-progs: Install udev-rules. References: <20200209091039.28594-1-brice@waegenei.re> In-Reply-To: <20200209091039.28594-1-brice@waegenei.re> Resent-Message-ID: From: Brice Waegeneire Date: Sun, 9 Feb 2020 10:38:42 +0100 Message-Id: <20200209093842.7882-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 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d7a984f42d..79430dea3e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4023,6 +4023,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 @@ -4043,7 +4049,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) @@ -4063,6 +4069,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") -- 2.24.1