unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: David Craven <david@craven.ch>
To: 24440@debbugs.gnu.org
Subject: bug#24440: [PATCH] gnu: kernel-config: Use correct kconfig file.
Date: Thu, 15 Sep 2016 12:16:42 +0200	[thread overview]
Message-ID: <20160915101642.12647-1-david@craven.ch> (raw)
In-Reply-To: <20160914210108.GA4985@jasmine>

* 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

  reply	other threads:[~2016-09-15 10:42 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-14 21:01 bug#24440: [csanchezdll@gmail.com: Using arch for kernel config file breaks kernel builds] Leo Famulari
2016-09-15 10:16 ` David Craven [this message]
2016-09-24  1:49   ` bug#24440: [PATCH] gnu: kernel-config: Use correct kconfig file Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160915101642.12647-1-david@craven.ch \
    --to=david@craven.ch \
    --cc=24440@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).