[gentoo-commits] proj/genkernel:master commit in: /, defaults/

[Robin H. Johnson]

commit:     c31abf34278eef8f68585aa6b458ad7a5b4b535c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 06:18:41 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 06:18:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c31abf34

gen_configkernel: bug #486366, fix virtio kconfig options.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 defaults/kernel-generic-config |  3 +++
 gen_configkernel.sh            | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 7b8826d..aa4f11b 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -474,6 +474,9 @@ CONFIG_VIRTIO_NET=m
 CONFIG_VMXNET3=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_VIRTIO_CONSOLE=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+
 
 #
 # SCSI device support

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 7e74f32..390a6da 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -162,9 +162,20 @@ config_kernel() {
        if isTrue ${CMD_VIRTIO}
        then
                for k in \
-                       CONFIG_PARAVIRT_GUEST CONFIG_VIRTIO_PCI 
CONFIG_VIRTIO_BALLOON \
-                       CONFIG_VIRTIO_MMIO CONFIG_VIRTIO_BLK CONFIG_SCSI_VIRTIO 
\
-                       CONFIG_VIRTIO_NET CONFIG_VHOST_NET ; do
+                       CONFIG_VIRTIO \
+                       CONFIG_VIRTIO_BALLOON \
+                       CONFIG_VIRTIO_BLK \
+                       CONFIG_VIRTIO_CONSOLE \
+                       CONFIG_VIRTIO_INPUT \
+                       CONFIG_VIRTIO_MMIO \
+                       CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES \
+                       CONFIG_VIRTIO_NET \
+                       CONFIG_VIRTIO_PCI \
+                       \
+                       CONFIG_PARAVIRT_GUEST \
+                       CONFIG_SCSI_VIRTIO \
+                       CONFIG_VHOST_NET \
+                       ; do
                        kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "y"
                done
        fi