06/10: gnu: linux-libre: Use kmod.

[David Craven]

dvc pushed a commit to branch master
in repository guix.

commit 78edccccaf3bb0091b7edc97f0d92b15b1f23078
Author: David Craven <address@hidden>
Date:   Thu Sep 8 19:27:52 2016 +0200

    gnu: linux-libre: Use kmod.
    
    * gnu/packages/linux.scm (make-linux-libre): Use kmod.
---
 gnu/packages/linux.scm |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index eabcbbe..96ab43b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -296,7 +296,7 @@ for ARCH and optionally VARIANT, or #f if there is no such 
configuration."
      `(("perl" ,perl)
        ("bc" ,bc)
        ("openssl" ,openssl)
-       ("module-init-tools" ,module-init-tools)
+       ("kmod" ,kmod)
        ,@(let ((conf (configuration-file
                       (system->linux-architecture
                        (or (%current-target-system)
@@ -355,7 +355,7 @@ for ARCH and optionally VARIANT, or #f if there is no such 
configuration."
            (lambda* (#:key inputs native-inputs outputs #:allow-other-keys)
              (let* ((out    (assoc-ref outputs "out"))
                     (moddir (string-append out "/lib/modules"))
-                    (mit    (assoc-ref (or native-inputs inputs) 
"module-init-tools")))
+                    (kmod    (assoc-ref (or native-inputs inputs) "kmod")))
                (mkdir-p moddir)
                (for-each (lambda (file)
                            (copy-file file
@@ -363,7 +363,7 @@ for ARCH and optionally VARIANT, or #f if there is no such 
configuration."
                          (find-files "." 
"^(bzImage|zImage|vmlinuz|System\\.map)$"))
                (copy-file ".config" (string-append out "/config"))
                (zero? (system* "make"
-                               (string-append "DEPMOD=" mit "/sbin/depmod")
+                               (string-append "DEPMOD=" kmod "/bin/depmod")
                                (string-append "MODULE_DIR=" moddir)
                                (string-append "INSTALL_PATH=" out)
                                (string-append "INSTALL_MOD_PATH=" out)