[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/17] gnu: make-linux-libre: Add additional-configuration parame
From: |
David Craven |
Subject: |
[PATCH 08/17] gnu: make-linux-libre: Add additional-configuration parameter. |
Date: |
Fri, 9 Sep 2016 14:34:17 +0200 |
* gnu/packages/linux.scm (linux-libre): Use
%default-additional-kernel-configuration.
(%default-additional-kernel-configuration): New variable.
---
gnu/packages/linux.scm | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ab20f6e..f629045 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -257,10 +257,26 @@ for SYSTEM and optionally VARIANT, or #f if there is no
such configuration."
(file (string-append "gnu/packages/" name)))
(search-path %load-path file)))
+(define %default-additional-kernel-configuration
+ (string-append "CONFIG_NET_9P=m\n"
+ "CONFIG_NET_9P_VIRTIO=m\n"
+ "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"))
+
(define* (make-linux-libre version hash
#:key
(configuration-file #f)
- (defconfig "defconfig"))
+ (defconfig "defconfig")
+ (additional-configuration
+ %default-additional-kernel-configuration))
(package
(name "linux-libre")
(version version)
@@ -315,19 +331,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no
such configuration."
;; 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=m\n"
- "CONFIG_NET_9P_VIRTIO=m\n"
- "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)
+ (display ,additional-configuration port)
(close-port port))
(zero? (system* "make" "oldconfig")))))
--
2.9.0
- [PATCH 04/17] gnu: linux-libre: Apply %boot-logo patch in origin., (continued)
- [PATCH 05/17] gnu: linux-libre: Move kernel configuration to configure phase., David Craven, 2016/09/09
- Re: [PATCH 05/17] gnu: linux-libre: Move kernel configuration to configure phase., Ludovic Courtès, 2016/09/11
- [PATCH 02/17] gnu: linux-libre: Use modify-phases., David Craven, 2016/09/09
- [PATCH 03/17] gnu: linux-libre: Use system->architecture., David Craven, 2016/09/09
- [PATCH 06/17] gnu: linux-libre: Add support for cross-compilation., David Craven, 2016/09/09
- Re: [PATCH 06/17] gnu: linux-libre: Add support for cross-compilation., Ludovic Courtès, 2016/09/11
- [PATCH 07/17] gnu: linux-libre: Use make-linux-libre., David Craven, 2016/09/09
- Re: [PATCH 07/17] gnu: linux-libre: Use make-linux-libre., Ludovic Courtès, 2016/09/11
- [PATCH 08/17] gnu: make-linux-libre: Add additional-configuration parameter.,
David Craven <=
- Re: [PATCH 08/17] gnu: make-linux-libre: Add additional-configuration parameter., Ludovic Courtès, 2016/09/11
- [PATCH 09/17] gnu: dtc: Remove patch-paths phase., David Craven, 2016/09/09
- Re: [PATCH 09/17] gnu: dtc: Remove patch-paths phase., Ludovic Courtès, 2016/09/11
- [PATCH 10/17] gnu: Add u-boot-beagle-bone-black., David Craven, 2016/09/09
- Re: [PATCH 10/17] gnu: Add u-boot-beagle-bone-black., Ludovic Courtès, 2016/09/11
- [PATCH 11/17] gnu: Add make-linux-libre-source., David Craven, 2016/09/09
- Re: [PATCH 11/17] gnu: Add make-linux-libre-source., Ludovic Courtès, 2016/09/11
- Re: [PATCH 11/17] gnu: Add make-linux-libre-source., Ludovic Courtès, 2016/09/11
- [PATCH 13/17] gnu: make-linux-libre: Add zImage to output., David Craven, 2016/09/09
- Re: [PATCH 13/17] gnu: make-linux-libre: Add zImage to output., Ludovic Courtès, 2016/09/11