GNU bug report logs - #40422
[PATCH] gnu: kmod: Update to 27.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 40422 in the body.
You can then email your comments to 40422 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: kmod: Update to 27.
Date: Sat,  4 Apr 2020 09:15:34 +0200

* gnu/packages/linux.scm (kmod): Update to 27. Enable tests.
---

This patch need to be merge on core-updates because > 2200 packages will need
to be rebuilt.  Without this patch (in particular `--sysconfdir=/etc`) it's
not possible to pass module arguments to `kernel-module-loader` from
<https://issues.guix.info/issue/40274>.

 gnu/packages/linux.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 945c15d972..10783c0f5a 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -42,6 +42,7 @@
 ;;; Copyright © 2020 Pierre Neidhardt <mail <at> ambrevar.xyz>
 ;;; Copyright © 2020 Chris Marusich <cmmarusich <at> gmail.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll <at> gmail.com>
+;;; Copyright © 2020 Brice Waegeneire <brice <at> 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,7 +2740,7 @@ 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
@@ -2748,8 +2749,8 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.")
      `(("xz" ,xz)
        ("zlib" ,zlib)))
     (arguments
-     `(#:tests? #f                      ; FIXME: Investigate test failures
-       #:configure-flags '("--with-xz" "--with-zlib")
+     `(#:configure-flags '("--with-xz" "--with-zlib" "--sysconfdir=/etc"
+                           "--disable-test-modules")
        #:phases
        (modify-phases %standard-phases
          (add-after 'install 'install-modprobe&co
-- 
2.26.0

Message #8 received at 40422 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Brice Waegeneire <brice <at> waegenei.re>, 40422 <at> debbugs.gnu.org
Subject: Re: [bug#40422] [PATCH] gnu: kmod: Update to 27.
Date: Sun, 05 Apr 2020 16:45:48 +0200

[Message part 1 (text/plain, inline)]

Brice Waegeneire <brice <at> waegenei.re> writes:

> * gnu/packages/linux.scm (kmod): Update to 27. Enable tests.
> ---
>
> This patch need to be merge on core-updates because > 2200 packages will need
> to be rebuilt.  Without this patch (in particular `--sysconfdir=/etc`) it's
> not possible to pass module arguments to `kernel-module-loader` from
> <https://issues.guix.info/issue/40274>.

As the core-updates branch is frozen right now, could you submit this
patch as a 'kmod/next' variable?  See e.g. 'help2man/latest' or
'automake-1.16.2' for inspiration.

After the core-updates merge, we can do a larger 'staging' round that
updates the default 'kmod'.

I wonder if we should patch eudev to use
/run/current-system/profile/bin/ instead of /gnu/store/...kmod/bin so
that we can update kmod without triggering a huge rebuild.

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 40422 <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 40422 <at> debbugs.gnu.org
Subject: Re: [bug#40422] [PATCH] gnu: kmod: Update to 27.
Date: Sun, 05 Apr 2020 15:57:28 +0000

On 2020-04-05 14:45, Marius Bakke wrote:
> Brice Waegeneire <brice <at> waegenei.re> writes:
> 
>> * gnu/packages/linux.scm (kmod): Update to 27. Enable tests.
>> ---
>> 
>> This patch need to be merge on core-updates because > 2200 packages 
>> will need
>> to be rebuilt.  Without this patch (in particular `--sysconfdir=/etc`) 
>> it's
>> not possible to pass module arguments to `kernel-module-loader` from
>> <https://issues.guix.info/issue/40274>.
> 
> As the core-updates branch is frozen right now, could you submit this
> patch as a 'kmod/next' variable?  See e.g. 'help2man/latest' or
> 'automake-1.16.2' for inspiration.

I can do that but I would need to adjust %modprobe-wrapper for
`kernel-loader-module` to work without the crutch at 8c88e24229 since 
the service
gets its modprobe from "/proc/sys/kernel/modprobe".

> After the core-updates merge, we can do a larger 'staging' round that
> updates the default 'kmod'.
> 
> I wonder if we should patch eudev to use
> /run/current-system/profile/bin/ instead of /gnu/store/...kmod/bin so
> that we can update kmod without triggering a huge rebuild.

eudev uses libkmod to to use it's kmod feature so I'm not sure how to do 
this.

Message #14 received at 40422 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Brice Waegeneire <brice <at> waegenei.re>
Cc: 40422 <at> debbugs.gnu.org
Subject: Re: [bug#40422] [PATCH] gnu: kmod: Update to 27.
Date: Mon, 06 Apr 2020 00:14:31 +0200

[Message part 1 (text/plain, inline)]

Brice Waegeneire <brice <at> waegenei.re> writes:

> On 2020-04-05 14:45, Marius Bakke wrote:
>> Brice Waegeneire <brice <at> waegenei.re> writes:
>> 
>>> * gnu/packages/linux.scm (kmod): Update to 27. Enable tests.
>>> ---
>>> 
>>> This patch need to be merge on core-updates because > 2200 packages 
>>> will need
>>> to be rebuilt.  Without this patch (in particular `--sysconfdir=/etc`) 
>>> it's
>>> not possible to pass module arguments to `kernel-module-loader` from
>>> <https://issues.guix.info/issue/40274>.
>> 
>> As the core-updates branch is frozen right now, could you submit this
>> patch as a 'kmod/next' variable?  See e.g. 'help2man/latest' or
>> 'automake-1.16.2' for inspiration.
>
> I can do that but I would need to adjust %modprobe-wrapper for
> `kernel-loader-module` to work without the crutch at 8c88e24229 since 
> the service
> gets its modprobe from "/proc/sys/kernel/modprobe".

Huh, what kind of sorcery is this?  :-)

Let's hold this patch until core-updates is merged, then I think we can
run it through 'staging'.

>> After the core-updates merge, we can do a larger 'staging' round that
>> updates the default 'kmod'.
>> 
>> I wonder if we should patch eudev to use
>> /run/current-system/profile/bin/ instead of /gnu/store/...kmod/bin so
>> that we can update kmod without triggering a huge rebuild.
>
> eudev uses libkmod to to use it's kmod feature so I'm not sure how to do 
> this.

Oh right, I didn't realize there was a libkmod.

[signature.asc (application/pgp-signature, inline)]

Message #17 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: guix-patches <at> gnu.org
Subject: [PATCH v3] gnu: kmod: Update to 27.
Date: Wed,  8 Apr 2020 09:11:55 +0200

* gnu/packages/linux.scm (kmod): Update to 27. Enable tests.
---

This patch isn't related with #40274[0] anymore, the “--sysconfdir” flag has
been removed as well as the reverting commit. As discussed in[1] the
configuration of modprobe will be done, in an other patch series, by setting
the “MODPROBE_OPTIONS” varaible in the wrapper returned by
“/proc/sys/kernel/modprobe”.

[0] https://issues.guix.info/issue/40274
[1]: https://lists.gnu.org/archive/html/guix-devel/2020-04/msg00108.html

 gnu/packages/linux.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c8acb42352..386158290f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -42,6 +42,7 @@
 ;;; Copyright © 2020 Pierre Neidhardt <mail <at> ambrevar.xyz>
 ;;; Copyright © 2020 Chris Marusich <cmmarusich <at> gmail.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll <at> gmail.com>
+;;; Copyright © 2020 Brice Waegeneire <brice <at> waegenei.re>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2779,7 +2780,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
@@ -2787,7 +2788,7 @@ 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
@@ -2796,8 +2797,8 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.")
      `(("xz" ,xz)
        ("zlib" ,zlib)))
     (arguments
-     `(#:tests? #f                      ; FIXME: Investigate test failures
-       #:configure-flags '("--with-xz" "--with-zlib")
+     `(#:configure-flags '("--with-xz" "--with-zlib"
+                           "--disable-test-modules")
        #:phases
        (modify-phases %standard-phases
          (add-after 'install 'install-modprobe&co
-- 
2.26.0

Message #20 received at 40422 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Brice Waegeneire <brice <at> waegenei.re>
Cc: 40422 <at> debbugs.gnu.org
Subject: Re: [bug#40422] [PATCH v3] gnu: kmod: Update to 27.
Date: Mon, 13 Apr 2020 13:20:47 +0200

[Message part 1 (text/plain, inline)]

Hi Brice,

I get

depmod: WARNING: could not open modules.order at /lib/modules/4.4.4: No such file or directory
depmod: WARNING: could not open modules.builtin at /lib/modules/4.4.4: No such file or directory
depmod: WARNING: could not open modules.order at /lib/modules/4.4.4: No such file or directory
depmod: WARNING: could not open modules.builtin at /lib/modules/4.4.4: No such file or directory
[...]
TESTSUITE: 'depmod_search_order_external_last' [7595] exited with return code 0
TESTSUITE: ERR: sizes do not match /tmp/guix-build-kmod-27.drv-0/kmod-27/testsuite/rootfs/test-depmod/search-order-external-last/lib/modules/4.4.4/correct-modules.dep /tmp/guix-build-kmod-27.drv-0/kmod-27/testsuite/rootfs/test-depmod/search-order-external-last/lib/modules/4.4.4/modules.dep
TESTSUITE: ERR: FAILED: exit ok but outputs do not match: depmod_search_order_external_last
TESTSUITE: ------
FAIL testsuite/test-depmod (exit status: 1)

with your patch on staging...

[Message part 2 (application/pgp-signature, inline)]

Message #23 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: guix-patches <at> gnu.org
Subject: [PATCH v4] gnu: kmod: Update to 27.
Date: Mon, 13 Apr 2020 15:34:31 +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.
---

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

Message #26 received at 40422 <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: 40422 <at> debbugs.gnu.org
Subject: Re: [bug#40422] [PATCH v3] gnu: kmod: Update to 27.
Date: Mon, 13 Apr 2020 13:39:07 +0000

Hello Danny,

On 2020-04-13 11:20, Danny Milosavljevic wrote:
> Hi Brice,
> 
> I get
> 
> depmod: WARNING: could not open modules.order at /lib/modules/4.4.4:
> No such file or directory
> depmod: WARNING: could not open modules.builtin at /lib/modules/4.4.4:
> No such file or directory
> depmod: WARNING: could not open modules.order at /lib/modules/4.4.4:
> No such file or directory
> depmod: WARNING: could not open modules.builtin at /lib/modules/4.4.4:
> No such file or directory
> [...]
> TESTSUITE: 'depmod_search_order_external_last' [7595] exited with 
> return code 0
> TESTSUITE: ERR: sizes do not match
> /tmp/guix-build-kmod-27.drv-0/kmod-27/testsuite/rootfs/test-depmod/search-order-external-last/lib/modules/4.4.4/correct-modules.dep
> /tmp/guix-build-kmod-27.drv-0/kmod-27/testsuite/rootfs/test-depmod/search-order-external-last/lib/modules/4.4.4/modules.dep
> TESTSUITE: ERR: FAILED: exit ok but outputs do not match:
> depmod_search_order_external_last
> TESTSUITE: ------
> FAIL testsuite/test-depmod (exit status: 1)
> 
> with your patch on staging...

Thanks for the heads up. As written in the Makefile not using
“--sysconfdir=/etc” will make some tests fail, these tests are now 
disable
in v4. BTW this patch should go on core-updates.

Cheers,
- Brice

Message #29 received at 40422 <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: 40422 <at> debbugs.gnu.org
Subject: Re: [bug#40422] [PATCH v4] gnu: kmod: Update to 27.
Date: Tue, 21 Apr 2020 08:57:42 +0000

Ping?

Message #32 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: guix-patches <at> gnu.org
Subject: [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 <mail <at> ambrevar.xyz>
 ;;; Copyright © 2020 Chris Marusich <cmmarusich <at> gmail.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll <at> gmail.com>
+;;; Copyright © 2020 Brice Waegeneire <brice <at> waegenei.re>
 ;;;
 ;;; 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

Message #37 received at 40422-done <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: 40422-done <at> debbugs.gnu.org
Subject: Pushed [PATCH] gnu: kmod: Update to 27
Date: Sun, 10 May 2020 17:22:49 +0000

Pushed on staging as 8229ce3116c1f522c7157ab2dcd50dc2d765686a.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.