me
/
guix
Archived
1
0
Fork 0
Code

gnu: linux-libre: Fallback to 'defconfig' when there's no config file. 

* gnu/packages/linux.scm (kernel-config): Return #f rather than error
  out in the default case.
  (linux-libre)[native-inputs]: Add "kconfig" input only when
  'kernel-config' returns true.
  [build-phase]: Adjust accordingly.
master
Ludovic Courtès 2014-07-10 13:03:46 +02:00
parent 9ca7eaa134
commit 1650dd8a38
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/linux.scm
View File

@ -172,7 +172,7 @@
(define (kernel-config system) (define (kernel-config system)
"Return the absolute file name of the Linux-Libre build configuration file "Return the absolute file name of the Linux-Libre build configuration file
for SYSTEM." for SYSTEM, or #f if there is no configuration for SYSTEM."
(define (lookup file) (define (lookup file)
(let ((file (string-append "gnu/packages/" file))) (let ((file (string-append "gnu/packages/" file)))
(search-path %load-path file))) (search-path %load-path file)))
@ -183,7 +183,7 @@ for SYSTEM."
("x86_64-linux" ("x86_64-linux"
(lookup "linux-libre-x86_64.conf")) (lookup "linux-libre-x86_64.conf"))
(_ (_
(error "unsupported architecture" system)))) #f)))
(define-public linux-libre (define-public linux-libre
(let* ((version "3.15") (let* ((version "3.15")
@ -201,8 +201,14 @@ for SYSTEM."
(let ((build (assoc-ref %standard-phases 'build)) (let ((build (assoc-ref %standard-phases 'build))
(config (assoc-ref inputs "kconfig"))) (config (assoc-ref inputs "kconfig")))
(copy-file config ".config")
(chmod ".config" #o666) ;; Use the architecture-specific config if available, and
;; 'defconfig' otherwise.
(if config
(begin
(copy-file config ".config")
(chmod ".config" #o666))
(system* "make" "defconfig"))
;; Appending works even when the option wasn't in the ;; Appending works even when the option wasn't in the
;; file. The last one prevails if duplicated. ;; file. The last one prevails if duplicated.
@ -258,8 +264,12 @@ for SYSTEM."
("bc" ,bc) ("bc" ,bc)
("module-init-tools" ,module-init-tools) ("module-init-tools" ,module-init-tools)
("patch/freedo+gnu" ,%boot-logo-patch) ("patch/freedo+gnu" ,%boot-logo-patch)
("kconfig" ,(kernel-config (or (%current-target-system)
(%current-system)))))) ,@(let ((conf (kernel-config (or (%current-target-system)
(%current-system)))))
(if conf
`(("kconfig" ,conf))
'()))))
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)