ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: linux-libre: Avoid invalid "kconfig" input on armhf and mips64el.

Browse source 
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.
This commit is contained in:
Ludovic Courtès 2016-12-20 23:36:21 +01:00
parent 899358d18a
commit 64b5e41376
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/linux.scm
View file

@ -245,13 +245,15 @@ (define* (make-linux-libre version hash supported-systems
("bc" ,bc) ("bc" ,bc)
("openssl" ,openssl) ("openssl" ,openssl)
("kmod" ,kmod) ("kmod" ,kmod)
,@(if configuration-file ,@(match (and configuration-file
`(("kconfig" ,(configuration-file (configuration-file
(system->linux-architecture (system->linux-architecture
(or (%current-target-system) (or (%current-target-system) (%current-system)))
(%current-system))) #:variant (version-major+minor version)))
#:variant (version-major+minor version)))) (#f ;no config for this platform
'()))) '())
((? string? config)
`(("kconfig" ,config))))))
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)