me/guix
Archived
1
0
Fork 0
Code Activity

gnu: kmod: Update to 27.

Browse source 
* 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 commit is contained in:
Brice Waegeneire 2020-04-04 09:05:21 +02:00 • committed by Marius Bakke
parent 9edb3f66fd
commit ddcfc46796
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/linux.scm
View file

@ -43,6 +43,7 @@
;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -2937,7 +2938,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.")
(define-public kmod (define-public kmod
(package (package
(name "kmod") (name "kmod")
(version "26") (version "27")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -2945,19 +2946,29 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.")
"kmod-" version ".tar.xz")) "kmod-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"17dvrls70nr3b3x1wm8pwbqy4r8a5c20m0dhys8mjhsnpg425fsp")) "035wzfzjx4nwidk747p8n085mgkvy531ppn16krrajx2dkqzply1"))
(patches (search-patches "kmod-module-directory.patch")))) (patches (search-patches "kmod-module-directory.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("automake" ,automake)
("autoconf" ,autoconf)
("pkg-config" ,pkg-config)))
(inputs (inputs
`(("xz" ,xz) `(("xz" ,xz)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:tests? #f ; FIXME: Investigate test failures `(#:configure-flags '("--with-xz" "--with-zlib"
#:configure-flags '("--with-xz" "--with-zlib") "--disable-test-modules")
#:phases #:phases
(modify-phases %standard-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 (add-after 'install 'install-modprobe&co
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))