mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: linux-libre: Make configuration more robust.
* gnu/packages/linux.scm (linux-libre): Append all configuration instead of replacing. Order configuration like "make oldconfig" output. Remove useless output. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
parent
574e86f9cf
commit
c0888b3fe4
1 changed files with 11 additions and 18 deletions
|
@ -162,26 +162,19 @@ (define-public linux-libre
|
|||
(let ((build (assoc-ref %standard-phases 'build)))
|
||||
(and (zero? (system* "make" "defconfig"))
|
||||
(begin
|
||||
(format #t "enabling additional modules...~%")
|
||||
(substitute* ".config"
|
||||
(("^# CONFIG_CIFS.*$")
|
||||
"CONFIG_CIFS=m\n")
|
||||
(("^# CONFIG_FUSE_FS.*$")
|
||||
"CONFIG_FUSE_FS=m\n")
|
||||
(("^# CONFIG_([[:graph:]]*)VIRTIO([[:graph:]]*) .*$"
|
||||
_ before after)
|
||||
(string-append "CONFIG_" before "VIRTIO"
|
||||
after "=m\n")))
|
||||
|
||||
;; XXX: For some reason, some virtio modules need to be
|
||||
;; explicitly added.
|
||||
;; Appending works even when the option wasn't in the
|
||||
;; file. The last one prevails if duplicated.
|
||||
(let ((port (open-file ".config" "a")))
|
||||
(display (string-append "CONFIG_NET_9P_VIRTIO=m\n"
|
||||
"CONFIG_NET_9P=m\n"
|
||||
"CONFIG_9P_FS=m\n"
|
||||
"CONFIG_VIRTIO_NET=m\n"
|
||||
(display (string-append "CONFIG_NET_9P=m\n"
|
||||
"CONFIG_NET_9P_VIRTIO=m\n"
|
||||
"CONFIG_VIRTIO_BLK=m\n"
|
||||
"CONFIG_VIRTIO_BALLOON=m\n")
|
||||
"CONFIG_VIRTIO_NET=m\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))
|
||||
|
||||
|
|
Loading…
Reference in a new issue