~ruther/guix-local: gnu: linux-libre: Avoid invalid "kconfig" input on armhf and mips64el.

64b5e4137649be75c6f4ea37991be95a23844a95 — Ludovic Courtès 9 years ago 899358d

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.

patch browse .tar.gz

1 files changed, 9 insertions(+), 7 deletions(-)

M gnu/packages/linux.scm

M gnu/packages/linux.scm => gnu/packages/linux.scm +9 -7

@@ 245,13 245,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)