all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Brice Waegeneire <brice@waegenei.re>
To: 40422@debbugs.gnu.org
Subject: [bug#40422] [PATCH v4] gnu: kmod: Update to 27.
Date: Mon, 13 Apr 2020 15:34:31 +0200	[thread overview]
Message-ID: <20200413133431.8039-1-brice@waegenei.re> (raw)
In-Reply-To: <20200404071534.17291-1-brice@waegenei.re>

* 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 <mail@ambrevar.xyz>
 ;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
+;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
 ;;;
 ;;; 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

  parent reply	other threads:[~2020-04-13 13:35 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-04  7:15 [bug#40422] [PATCH] gnu: kmod: Update to 27 Brice Waegeneire
2020-04-05 14:45 ` Marius Bakke
2020-04-05 15:57   ` Brice Waegeneire
2020-04-05 22:14     ` Marius Bakke
2020-04-08  7:11 ` [bug#40422] [PATCH v3] " Brice Waegeneire
2020-04-13 11:20   ` Danny Milosavljevic
2020-04-13 13:39     ` Brice Waegeneire
2020-04-21  8:57     ` [bug#40422] [PATCH v4] " Brice Waegeneire
2020-04-13 13:34 ` Brice Waegeneire [this message]
2020-04-27 13:51 ` [bug#40422] [PATCH v5] gnu: Update kmod " Brice Waegeneire
2020-05-10 17:22 ` bug#40422: Pushed [PATCH] gnu: kmod: Update " Brice Waegeneire

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200413133431.8039-1-brice@waegenei.re \
    --to=brice@waegenei.re \
    --cc=40422@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.