nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: make-linux-libre: Add extra-options parameter. 

* gnu/packages/linux.scm (linux-libre): Use
  %default-extra-linux-options.
  (config->string, %default-extra-linux-options): New variables.
This commit is contained in:
David Craven 2016-09-08 16:47:52 +02:00
parent c258807a85
commit 90c18c321e
No known key found for this signature in database
GPG Key ID: C5E051C79C0BECDB
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gnu/packages/linux.scm
View File

@ -247,12 +247,38 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
(file (string-append "gnu/packages/" name))) (file (string-append "gnu/packages/" name)))
(if file-exists? (search-path %load-path file) #f))) (if file-exists? (search-path %load-path file) #f)))
(define %default-extra-linux-options
`(("CONFIG_NET_9P" . m)
("CONFIG_NET_9P_VIRTIO" . m)
("CONFIG_VIRTIO_BLK" . m)
("CONFIG_VIRTIO_NET" . m)
;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html
("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t)
("CONFIG_VIRTIO_PCI" . m)
("CONFIG_VIRTIO_BALLOON" . m)
("CONFIG_VIRTIO_MMIO" . m)
("CONFIG_FUSE_FS" . m)
("CONFIG_CIFS" . m)
("CONFIG_9P_FS" . m)))
(define (config->string options)
(string-join (map (match-lambda
((option . 'm)
(string-append option "=m"))
((option . #t)
(string-append option "=y"))
((option . #f)
(string-append option "=n")))
options)
"\n"))
(define* (make-linux-libre version hash (define* (make-linux-libre version hash
#:key #:key
;; A function that takes an arch and a variant. ;; A function that takes an arch and a variant.
;; See kernel-config for an example. ;; See kernel-config for an example.
(configuration-file #f) (configuration-file #f)
(defconfig "defconfig")) (defconfig "defconfig")
(extra-options %default-extra-linux-options))
(package (package
(name "linux-libre") (name "linux-libre")
(version version) (version version)
@ -314,20 +340,9 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
;; 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.
(let ((port (open-file ".config" "a"))) (let ((port (open-file ".config" "a"))
(display (string-append "CONFIG_NET_9P=m\n" (extra-configuration ,(config->string extra-options)))
"CONFIG_NET_9P_VIRTIO=m\n" (display extra-configuration port)
"CONFIG_VIRTIO_BLK=m\n"
"CONFIG_VIRTIO_NET=m\n"
;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html
"CONFIG_DEVPTS_MULTIPLE_INSTANCES=y\n"
"CONFIG_VIRTIO_PCI=m\n"
"CONFIG_VIRTIO_BALLOON=m\n"
"CONFIG_VIRTIO_MMIO=m\n"
"CONFIG_FUSE_FS=m\n"
"CONFIG_CIFS=m\n"
"CONFIG_9P_FS=m\n")
port)
(close-port port)) (close-port port))
(zero? (system* "make" "oldconfig"))))) (zero? (system* "make" "oldconfig")))))