[PATCH] gnu: linux-libre: Make configuration more robust.

[PATCH] gnu: linux-libre: Make configuration more robust.

[Alírio Eyng]

"enabling additional modules...": for search it is just a few lines
after "starting phase `build'" and it would need change when options
not enabling modules are added.
For my next patch, I will add compatibility to my hardware. I don't
think splitting in vm and hardware kernel is useful, WDYT?

From 2cdd7ac96bcf89bfe98de1d8f966c3a307ef3de3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=ADrio=20Eyng?= <alirioeyng@gmail.com>
Date: Sun, 6 Apr 2014 15:37:33 +0000
Subject: [PATCH] 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.
---
 gnu/packages/linux.scm | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 21daf0b..f927aac 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -162,26 +162,19 @@
              (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 doesn't was in
+                      ;; the file. The last 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))

-- 
1.8.4

Re: [PATCH] gnu: linux-libre: Make configuration more robust.

[Ludovic Courtès]

Alírio Eyng <alirioeyng@gmail.com> skribis:

> For my next patch, I will add compatibility to my hardware. I don't
> think splitting in vm and hardware kernel is useful, WDYT?

No, I think it’s better to keep just one, covering a wide range of uses.

> From 2cdd7ac96bcf89bfe98de1d8f966c3a307ef3de3 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Al=C3=ADrio=20Eyng?= <alirioeyng@gmail.com>
> Date: Sun, 6 Apr 2014 15:37:33 +0000
> Subject: [PATCH] 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.

Applied, with:

> +                      ;; Appending works even when the option doesn't was in
> +                      ;; the file. The last prevails if duplicated.

... typo fixed.

Thanks, and welcome! :-)

Ludo’.