* [bug#40422] [PATCH] gnu: kmod: Update to 27.
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-08 7:11 ` [bug#40422] [PATCH v3] " Brice Waegeneire
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Marius Bakke @ 2020-04-05 14:45 UTC (permalink / raw)
To: Brice Waegeneire, 40422
[-- Attachment #1: Type: text/plain, Size: 828 bytes --]
Brice Waegeneire <brice@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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread* [bug#40422] [PATCH] gnu: kmod: Update to 27.
2020-04-05 14:45 ` Marius Bakke
@ 2020-04-05 15:57 ` Brice Waegeneire
2020-04-05 22:14 ` Marius Bakke
0 siblings, 1 reply; 11+ messages in thread
From: Brice Waegeneire @ 2020-04-05 15:57 UTC (permalink / raw)
To: Marius Bakke; +Cc: 40422
On 2020-04-05 14:45, Marius Bakke wrote:
> Brice Waegeneire <brice@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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [bug#40422] [PATCH] gnu: kmod: Update to 27.
2020-04-05 15:57 ` Brice Waegeneire
@ 2020-04-05 22:14 ` Marius Bakke
0 siblings, 0 replies; 11+ messages in thread
From: Marius Bakke @ 2020-04-05 22:14 UTC (permalink / raw)
To: Brice Waegeneire; +Cc: 40422
[-- Attachment #1: Type: text/plain, Size: 1501 bytes --]
Brice Waegeneire <brice@waegenei.re> writes:
> On 2020-04-05 14:45, Marius Bakke wrote:
>> Brice Waegeneire <brice@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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* [bug#40422] [PATCH v3] gnu: kmod: Update to 27.
2020-04-04 7:15 [bug#40422] [PATCH] gnu: kmod: Update to 27 Brice Waegeneire
2020-04-05 14:45 ` Marius Bakke
@ 2020-04-08 7:11 ` Brice Waegeneire
2020-04-13 11:20 ` Danny Milosavljevic
2020-04-13 13:34 ` Brice Waegeneire
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Brice Waegeneire @ 2020-04-08 7:11 UTC (permalink / raw)
To: 40422
* 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@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.
;;;
@@ -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
^ permalink raw reply related [flat|nested] 11+ messages in thread* [bug#40422] [PATCH v3] gnu: kmod: Update to 27.
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
0 siblings, 2 replies; 11+ messages in thread
From: Danny Milosavljevic @ 2020-04-13 11:20 UTC (permalink / raw)
To: Brice Waegeneire; +Cc: 40422
[-- Attachment #1: Type: text/plain, Size: 980 bytes --]
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...
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* [bug#40422] [PATCH v3] gnu: kmod: Update to 27.
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
1 sibling, 0 replies; 11+ messages in thread
From: Brice Waegeneire @ 2020-04-13 13:39 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: 40422
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* [bug#40422] [PATCH v4] gnu: kmod: Update to 27.
2020-04-13 11:20 ` Danny Milosavljevic
2020-04-13 13:39 ` Brice Waegeneire
@ 2020-04-21 8:57 ` Brice Waegeneire
1 sibling, 0 replies; 11+ messages in thread
From: Brice Waegeneire @ 2020-04-21 8:57 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: 40422
Ping?
^ permalink raw reply [flat|nested] 11+ messages in thread
* [bug#40422] [PATCH v4] gnu: kmod: Update to 27.
2020-04-04 7:15 [bug#40422] [PATCH] gnu: kmod: Update to 27 Brice Waegeneire
2020-04-05 14:45 ` Marius Bakke
2020-04-08 7:11 ` [bug#40422] [PATCH v3] " Brice Waegeneire
@ 2020-04-13 13:34 ` Brice Waegeneire
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
4 siblings, 0 replies; 11+ messages in thread
From: Brice Waegeneire @ 2020-04-13 13:34 UTC (permalink / raw)
To: 40422
* 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
^ permalink raw reply related [flat|nested] 11+ messages in thread* [bug#40422] [PATCH v5] gnu: Update kmod to 27.
2020-04-04 7:15 [bug#40422] [PATCH] gnu: kmod: Update to 27 Brice Waegeneire
` (2 preceding siblings ...)
2020-04-13 13:34 ` Brice Waegeneire
@ 2020-04-27 13:51 ` Brice Waegeneire
2020-05-10 17:22 ` bug#40422: Pushed [PATCH] gnu: kmod: Update " Brice Waegeneire
4 siblings, 0 replies; 11+ messages in thread
From: Brice Waegeneire @ 2020-04-27 13:51 UTC (permalink / raw)
To: 40422
* 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@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.
;;;
@@ -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
^ permalink raw reply related [flat|nested] 11+ messages in thread* bug#40422: Pushed [PATCH] gnu: kmod: Update to 27
2020-04-04 7:15 [bug#40422] [PATCH] gnu: kmod: Update to 27 Brice Waegeneire
` (3 preceding siblings ...)
2020-04-27 13:51 ` [bug#40422] [PATCH v5] gnu: Update kmod " Brice Waegeneire
@ 2020-05-10 17:22 ` Brice Waegeneire
4 siblings, 0 replies; 11+ messages in thread
From: Brice Waegeneire @ 2020-05-10 17:22 UTC (permalink / raw)
To: 40422-done
Pushed on staging as 8229ce3116c1f522c7157ab2dcd50dc2d765686a.
^ permalink raw reply [flat|nested] 11+ messages in thread