[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#40422] [PATCH v5] gnu: Update kmod to 27.
From: |
Brice Waegeneire |
Subject: |
[bug#40422] [PATCH v5] gnu: Update kmod to 27. |
Date: |
Mon, 27 Apr 2020 15:51:45 +0200 |
* 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 <address@hidden>
;;; Copyright © 2020 Chris Marusich <address@hidden>
;;; Copyright © 2020 Vincent Legoll <address@hidden>
+;;; Copyright © 2020 Brice Waegeneire <address@hidden>
;;;
;;; 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