From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Craven Subject: bug#24440: [PATCH] gnu: kernel-config: Use correct kconfig file. Date: Thu, 15 Sep 2016 12:16:42 +0200 Message-ID: <20160915101642.12647-1-david@craven.ch> References: <20160914210108.GA4985@jasmine> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkU7M-0006fY-0u for bug-guix@gnu.org; Thu, 15 Sep 2016 06:42:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkU7H-0001H2-Qd for bug-guix@gnu.org; Thu, 15 Sep 2016 06:42:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkU7G-0001Ga-K6 for bug-guix@gnu.org; Thu, 15 Sep 2016 06:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bkU7G-0004Oj-CS for bug-guix@gnu.org; Thu, 15 Sep 2016 06:42:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkU6T-0006cR-V0 for bug-guix@gnu.org; Thu, 15 Sep 2016 06:41:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkU6P-00011c-PM for bug-guix@gnu.org; Thu, 15 Sep 2016 06:41:12 -0400 Received: from so254-10.mailgun.net ([198.61.254.10]:55444) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkU6O-0000yD-IP for bug-guix@gnu.org; Thu, 15 Sep 2016 06:41:09 -0400 In-Reply-To: <20160914210108.GA4985@jasmine> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: 24440@debbugs.gnu.org * 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