guix-commits
[Top][All Lists]
Advanced

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

01/01: gnu: linux-libre: Avoid invalid "kconfig" input on armhf and mips


From: Ricardo Wurmus
Subject: 01/01: gnu: linux-libre: Avoid invalid "kconfig" input on armhf and mips64el.
Date: Wed, 21 Dec 2016 09:23:54 +0000 (UTC)

rekado pushed a commit to branch version-0.12.0
in repository guix.

commit b291b3271a025dfe41e1a7fdfadd393373b0128d
Author: Ludovic Court├Ęs <address@hidden>
Date:   Tue Dec 20 23:36:21 2016 +0100

    gnu: linux-libre: Avoid invalid "kconfig" input on armhf and mips64el.
    
    This fixes a bug whereby:
    
      guix build linux-libre -s armhf-linux
    
    would fail with:
    
      guix build: error: gnu/packages/linux.scm:231:2: package 
`linux-libre-4.8.15' has an invalid input: ("kconfig" #f)
    
    This led 'tests/guix-system.sh' to fail.
    
    * gnu/packages/linux.scm (make-linux-libre)[native-inputs]: Never add #f
    as a "kconfig" input.
---
 gnu/packages/linux.scm |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 827ee8b..5d6fbbb 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -242,13 +242,15 @@ for ARCH and optionally VARIANT, or #f if there is no 
such configuration."
        ("bc" ,bc)
        ("openssl" ,openssl)
        ("kmod" ,kmod)
-       ,@(if configuration-file
-             `(("kconfig" ,(configuration-file
-                            (system->linux-architecture
-                             (or (%current-target-system)
-                                 (%current-system)))
-                            #:variant (version-major+minor version))))
-             '())))
+       ,@(match (and configuration-file
+                     (configuration-file
+                      (system->linux-architecture
+                       (or (%current-target-system) (%current-system)))
+                      #:variant (version-major+minor version)))
+           (#f                                    ;no config for this platform
+            '())
+           ((? string? config)
+            `(("kconfig" ,config))))))
     (arguments
      `(#:modules ((guix build gnu-build-system)
                   (guix build utils)



reply via email to

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