From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Craven Subject: [PATCH 14/17] gnu: linux-libre: Use kmod. Date: Fri, 9 Sep 2016 14:34:23 +0200 Message-ID: <20160909123426.18499-14-david@craven.ch> References: <20160909013641.GA9202@jasmine> <20160909123426.18499-1-david@craven.ch> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biL1G-0000G2-KD for guix-devel@gnu.org; Fri, 09 Sep 2016 08:34:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1biL1E-0003TL-QG for guix-devel@gnu.org; Fri, 09 Sep 2016 08:34:57 -0400 Received: from so254-10.mailgun.net ([198.61.254.10]:43114) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biL1D-0003Jp-I6 for guix-devel@gnu.org; Fri, 09 Sep 2016 08:34:56 -0400 In-Reply-To: <20160909123426.18499-1-david@craven.ch> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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 37bdbf4..62870a4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -291,7 +291,7 @@ for SYSTEM 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) ,@(if configuration-file `(("kconfig" ,configuration-file)) '()))) (arguments `(#:modules ((guix build gnu-build-system) @@ -341,7 +341,7 @@ for SYSTEM 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 @@ -349,7 +349,7 @@ for SYSTEM 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) -- 2.9.0