diff mbox series

[bug#37868,v2,1/2] build-system/linux-module: Disable depmod.

Message ID 20200218094207.6196-2-dannym@scratchpost.org
State Accepted
Headers show
Series system: Add kernel-module-packages to operating-system and use it. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Danny Milosavljevic Feb. 18, 2020, 9:42 a.m. UTC 
* guix/build/linux-module-build-system.scm (install): Disable depmod.
---
 guix/build/linux-module-build-system.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Ludovic Courtès Feb. 23, 2020, 4:22 p.m. UTC | #1 
Hi Danny,

Danny Milosavljevic <dannym@scratchpost.org> skribis:

> * guix/build/linux-module-build-system.scm (install): Disable depmod.

[...]

> -            (string-append "DEPMOD=" kmod "/bin/depmod")
> +            "DEPMOD=true" ; disable depmod.

Could you make the comment something like:

  ;; Disable depmod because X and Y.

Think of our future selves.  :-)

Otherwise LGTM.

Ludo’.
Danny Milosavljevic Feb. 25, 2020, 10:11 a.m. UTC | #2 
Hi,

>  [comment] Otherwise LGTM.

Pushed only this patch to guix master as commit 12f0aefd1418443823450fdd111259269ad3d9cb.

Thanks for the review!
diff mbox series

Patch

diff --git a/guix/build/linux-module-build-system.scm b/guix/build/linux-module-build-system.scm
index cd76df2de7..525851372e 100644
--- a/guix/build/linux-module-build-system.scm
+++ b/guix/build/linux-module-build-system.scm
@@ -60,15 +60,14 @@ 
 ;; part.
 (define* (install #:key inputs native-inputs outputs #:allow-other-keys)
   (let* ((out (assoc-ref outputs "out"))
-         (moddir (string-append out "/lib/modules"))
-         (kmod (assoc-ref (or native-inputs inputs) "kmod")))
+         (moddir (string-append out "/lib/modules")))
     ;; Install kernel modules
     (mkdir-p moddir)
     (invoke "make" "-C"
             (string-append (assoc-ref inputs "linux-module-builder")
                            "/lib/modules/build")
             (string-append "M=" (getcwd))
-            (string-append "DEPMOD=" kmod "/bin/depmod")
+            "DEPMOD=true" ; disable depmod.
             (string-append "MODULE_DIR=" moddir)
             (string-append "INSTALL_PATH=" out)
             (string-append "INSTALL_MOD_PATH=" out)