From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:43652) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNzEt-0000LV-4I for guix-patches@gnu.org; Mon, 13 Apr 2020 09:35:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNzEs-0005gT-2a for guix-patches@gnu.org; Mon, 13 Apr 2020 09:35:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47833) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jNzEr-0005gO-Vy for guix-patches@gnu.org; Mon, 13 Apr 2020 09:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jNzEr-0000I9-T5 for guix-patches@gnu.org; Mon, 13 Apr 2020 09:35:01 -0400 Subject: [bug#40422] [PATCH v4] gnu: kmod: Update to 27. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:43611) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNzEW-0000JX-Tv for guix-patches@gnu.org; Mon, 13 Apr 2020 09:34:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNzEV-0005UW-C2 for guix-patches@gnu.org; Mon, 13 Apr 2020 09:34:40 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:50535) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jNzEV-0005Ti-6I for guix-patches@gnu.org; Mon, 13 Apr 2020 09:34:39 -0400 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 4661B40004 for ; Mon, 13 Apr 2020 13:34:35 +0000 (UTC) From: Brice Waegeneire Date: Mon, 13 Apr 2020 15:34:31 +0200 Message-Id: <20200413133431.8039-1-brice@waegenei.re> In-Reply-To: <20200404071534.17291-1-brice@waegenei.re> References: <20200404071534.17291-1-brice@waegenei.re> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: 40422@debbugs.gnu.org * gnu/packages/linux.scm (kmod): Update to version 27. [native-inputs]: Add 'automake' and 'autoconf'. [arguments]: Add phase 'disable-tests'. Add configure flag '--disable-test-modules'. Enable tests. --- This version disable the 3 tests failling when '--sysconfdir=/etc' isn't used as warned by “warning: Some tests will fail without --sysconfdir=/etc”. gnu/packages/linux.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1c23489bc2..1de5ea8eaf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 Chris Marusich ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -2731,7 +2732,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") (define-public kmod (package (name "kmod") - (version "26") + (version "27") (source (origin (method url-fetch) (uri @@ -2739,19 +2740,28 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") "kmod-" version ".tar.xz")) (sha256 (base32 - "17dvrls70nr3b3x1wm8pwbqy4r8a5c20m0dhys8mjhsnpg425fsp")) + "035wzfzjx4nwidk747p8n085mgkvy531ppn16krrajx2dkqzply1")) (patches (search-patches "kmod-module-directory.patch")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("pkg-config" ,pkg-config))) (inputs `(("xz" ,xz) ("zlib" ,zlib))) (arguments - `(#:tests? #f ; FIXME: Investigate test failures - #:configure-flags '("--with-xz" "--with-zlib") + `(#:configure-flags (list "--with-xz" "--with-zlib" + "--disable-test-modules") #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-tests + (lambda _ + ;; XXX: These tests need '--sysconfdir=/etc' to pass. + (substitute* "Makefile.am" + (("testsuite/test-modprobe") "") + (("testsuite/test-depmod") "") + (("testsuite/test-blacklist") "")))) (add-after 'install 'install-modprobe&co (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- 2.26.0