guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: kernel-config: Find configuration file for i686.


From: David Craven
Subject: 01/01: gnu: kernel-config: Find configuration file for i686.
Date: Thu, 15 Sep 2016 20:00:11 +0000 (UTC)

dvc pushed a commit to branch master
in repository guix.

commit 25847b327e9add2c55ba4980a95708484db46473
Author: David Craven <address@hidden>
Date:   Thu Sep 15 21:54:01 2016 +0200

    gnu: kernel-config: Find configuration file for i686.
    
    * gnu/packages/linux.scm (kernel-config): Find configuration file for
      i686.
      (make-linux-libre)[origin]: Apply patch correctly.
---
 gnu/packages/linux.scm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3ec6514..cdb06b5 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -182,7 +182,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)))
 
@@ -228,7 +228,7 @@ for ARCH and optionally VARIANT, or #f if there is no such 
configuration."
               (method url-fetch)
               (uri (linux-libre-urls version))
               (sha256 (base32 hash))
-              (patches (origin-patches %boot-logo-patch))))
+              (patches (list %boot-logo-patch))))
     (supported-systems supported-systems)
     (build-system gnu-build-system)
     (native-inputs



reply via email to

[Prev in Thread] Current Thread [Next in Thread]