GNU bug report logs - #24440
[csanchezdll@gmail.com: Using arch for kernel config file breaks kernel builds]

Previous Next

Full log

View this message in rfc822 format

From: David Craven <david <at> craven.ch>
To: 24440 <at> debbugs.gnu.org
Cc: David Craven <david <at> craven.ch>
Subject: bug#24440: [PATCH] gnu: kernel-config: Use correct kconfig file.
Date: Thu, 15 Sep 2016 12:16:42 +0200

* gnu/packages/linux.scm (kernel-config): Use correct kconfig file.
---
 gnu/packages/linux.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3ec6514..61288be 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -82,10 +82,12 @@
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 match))
 
-(define-public (system->linux-architecture arch)
-  "Return the Linux architecture name for ARCH, a Guix system name such as
+;; Guix system name is one of x86_64-linux i686-linux armhf-linux mips64el-linux.
+;; GNU target triplet is one of arm-linux-gnueabihf mips64el-linux-gnuabi64.
+(define-public (system->linux-architecture system)
+  "Return the Linux architecture name for SYSTEM, a Guix system name such as
 \"x86_64-linux\" or a target triplet such as \"arm-linux-gnueabihf\"."
-  (let ((arch (car (string-split arch #\-))))
+  (let ((arch (car (string-split system #\-))))
     (cond ((string=? arch "i686") "i386")
           ((string-prefix? "mips" arch) "mips")
           ((string-prefix? "arm" arch) "arm")
@@ -182,7 +184,7 @@
 for ARCH and optionally VARIANT, or #f if there is no such configuration."
   (let* ((name (string-append "linux-libre-"
                               (if variant (string-append variant "-") "")
-                              arch ".conf"))
+                              (if (string=? "i386" arch) "i686" arch) ".conf"))
          (file (string-append "gnu/packages/" name)))
     (search-path %load-path file)))
 
-- 
2.9.0

Previous Next

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