From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A3F9A13825A for ; Mon, 16 May 2016 06:55:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3771141E3; Mon, 16 May 2016 06:55:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80EA114088 for ; Mon, 16 May 2016 06:55:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9859D340BFD for ; Mon, 16 May 2016 06:55:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C84E96E for ; Mon, 16 May 2016 06:55:43 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1463379521.c31abf34278eef8f68585aa6b458ad7a5b4b535c.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/kernel-generic-config gen_configkernel.sh X-VCS-Directories: / defaults/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: c31abf34278eef8f68585aa6b458ad7a5b4b535c X-VCS-Branch: master Date: Mon, 16 May 2016 06:55:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 873c179a-37ab-4640-a616-4a76176bad06 X-Archives-Hash: bf0478a94426bba07ccea77bb6801ea0 commit: c31abf34278eef8f68585aa6b458ad7a5b4b535c Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 16 06:18:41 2016 +0000 Commit: Robin H. Johnson gentoo 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 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