From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:49488) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT4Es-0003Ap-R0 for guix-patches@gnu.org; Mon, 27 Apr 2020 09:56:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jT4Es-0002kt-De for guix-patches@gnu.org; Mon, 27 Apr 2020 09:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54355) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jT4Es-0002ko-1z for guix-patches@gnu.org; Mon, 27 Apr 2020 09:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jT4Es-00072M-1c for guix-patches@gnu.org; Mon, 27 Apr 2020 09:56:02 -0400 Subject: [bug#40422] [PATCH v5] gnu: Update kmod to 27. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:49452) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT4EL-0002dx-Ea for guix-patches@gnu.org; Mon, 27 Apr 2020 09:55:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jT4EG-0002Us-RX for guix-patches@gnu.org; Mon, 27 Apr 2020 09:55:29 -0400 Received: from relay12.mail.gandi.net ([217.70.178.232]:59185) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jT4EF-0001k6-Uy for guix-patches@gnu.org; Mon, 27 Apr 2020 09:55:24 -0400 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay12.mail.gandi.net (Postfix) with ESMTPSA id E4ACA200059 for ; Mon, 27 Apr 2020 13:51:57 +0000 (UTC) From: Brice Waegeneire Date: Mon, 27 Apr 2020 15:51:45 +0200 Message-Id: <20200427135145.18884-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. --- Phase 'disable-tests' returns #t. gnu/packages/linux.scm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 12cb39ff9b..2b813286ff 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. ;;; @@ -2793,7 +2794,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 @@ -2801,19 +2802,29 @@ 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") "")) + #t)) (add-after 'install 'install-modprobe&co (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- 2.26.0