[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
142/155: gnu: linux-libre: Avoid invalid "kconfig" input on armhf and mi
From: |
John Darrington |
Subject: |
142/155: gnu: linux-libre: Avoid invalid "kconfig" input on armhf and mips64el. |
Date: |
Wed, 21 Dec 2016 20:48:42 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit d9d49510cbea1854a61516d26ff67ee26f19b125
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 78fab4e..799d00f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -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)
- 150/155: gnu: mlt: Update to 6.4.1., (continued)
- 150/155: gnu: mlt: Update to 6.4.1., John Darrington, 2016/12/21
- 154/155: gnu: coq: Build coqide, John Darrington, 2016/12/21
- 147/155: gnu: xcb-util-xrm: Update to 1.2., John Darrington, 2016/12/21
- 148/155: gnu: xf86-video-vmware: Update to 13.2.1., John Darrington, 2016/12/21
- 153/155: gnu: lablgtk: use ocamlfind in installation, John Darrington, 2016/12/21
- 155/155: installer: Add alternate method of finding TZDIR., John Darrington, 2016/12/21
- 89/155: Revert "gnu: linux-libre: Update to 4.9.", John Darrington, 2016/12/21
- 122/155: Update NEWS., John Darrington, 2016/12/21
- 01/155: gnu: Add graphical installer, John Darrington, 2016/12/21
- 33/155: doc: Update dot graphs., John Darrington, 2016/12/21
- 142/155: gnu: linux-libre: Avoid invalid "kconfig" input on armhf and mips64el.,
John Darrington <=
- 113/155: gnu: hunspell: Update to 1.5.4., John Darrington, 2016/12/21
- 114/155: gnu: hunspell: Add missing perl dependency., John Darrington, 2016/12/21
- 131/155: import: github: Use 'json-fetch'., John Darrington, 2016/12/21
- 151/155: Revert "gnu: curl: Update replacement to 7.52.0 [fixes CVE-2016-{9586, 9952, 9953}].", John Darrington, 2016/12/21
- 77/155: nls: Update 'pt_BR' translation., John Darrington, 2016/12/21
- 79/155: nls: Update 'fr' translation., John Darrington, 2016/12/21
- 76/155: nls: Update 'da' translation., John Darrington, 2016/12/21
- 86/155: gexp: Native inputs of nested gexps are properly accounted for., John Darrington, 2016/12/21
- 92/155: gnu: cutadapt: Update to 1.12., John Darrington, 2016/12/21
- 107/155: gnu: tor: Update to 0.2.9.8., John Darrington, 2016/12/21