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

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

[Leo Famulari]

----- Forwarded message from Carlos Sánchez de La Lama <csanchezdll@gmail.com> -----

Date: Wed, 14 Sep 2016 11:17:51 +0200
From: Carlos Sánchez de La Lama <csanchezdll@gmail.com>
To: guix-devel@gnu.org
Subject: Using arch for kernel config file breaks kernel builds
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)

Hi guys,

seems a commit yesterday (c258807a) broke kernel compilation on
i686. When searching for kernel configuration file,
system->linux-architecture reduces i686 to i386, but no matching
configuration file exists.

I see two options:
1) go back to using system instead of arch (which would allow different
config files for, say, i386 and i686).
2) rename all i686 config files to i386.

In any case, current HEAD does not build 32-bit x86 kernels. I have
renamed config file ti -i386 in my local copy to be able to build.

BR

Carlos

-- 
'Common misconception that; than fun is relaxing. If it is, you're not doing it
right.'

Iain M. Banks, "The Player of Games" (1988)


----- End forwarded message -----

bug#24440: [PATCH] gnu: kernel-config: Use correct kconfig file.

[David Craven]

* 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

bug#24440: [PATCH] gnu: kernel-config: Use correct kconfig file.

[Ludovic Courtès]

David Craven <david@craven.ch> skribis:

> * gnu/packages/linux.scm (kernel-config): Use correct kconfig file.

AFAICS, a variant of this patch was pushed as
25847b327e9add2c55ba4980a95708484db46473, so closing this bug.

Thank you,
Ludo’.