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 693D81381F3 for ; Mon, 5 Nov 2012 18:32:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9FC621C034; Mon, 5 Nov 2012 18:30:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8E55AE056C for ; Mon, 5 Nov 2012 18:30:31 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16A5433D8A5 for ; Mon, 5 Nov 2012 18:30:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 51DD9E5457 for ; Mon, 5 Nov 2012 18:30:27 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1350173116.12e4beeaf7b52545a16aa8d4655e5d39134c2436.ryao@gentoo> Subject: [gentoo-commits] proj/genkernel:ryao commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog gen_cmdline.sh gen_configkernel.sh gen_determineargs.sh X-VCS-Directories: / X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: 12e4beeaf7b52545a16aa8d4655e5d39134c2436 X-VCS-Branch: ryao Date: Mon, 5 Nov 2012 18:30:27 +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: 37044fd4-3c82-4e5a-85f9-6b0b95813b28 X-Archives-Hash: 5bdd22aeb29b6d22754071b2091dfda9 commit: 12e4beeaf7b52545a16aa8d4655e5d39134c2436 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Oct 14 00:05:16 2012 +0000 Commit: Richard Yao gentoo org> CommitDate: Sun Oct 14 00:05:16 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=12e4beea Bug #432956: Easy to include VirtIO support in kernel. Signed-off-by: Robin H. Johnson gentoo.org> --- ChangeLog | 4 ++++ gen_cmdline.sh | 5 +++++ gen_configkernel.sh | 13 +++++++++++++ gen_determineargs.sh | 1 + 4 files changed, 23 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95b25a4..85749dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ + 14 Oct 2012; Robin H. Johnson gen_cmdline.sh, + gen_configkernel.sh, gen_determineargs.sh: + Bug #432956: Easy to include VirtIO support in kernel. + 13 Oct 2012; Robin H. Johnson arch/alpha/modules_load, arch/arm/modules_load, arch/ia64/modules_load, arch/mips/modules_load, arch/parisc/modules_load, arch/parisc64/modules_load, arch/ppc/modules_load, diff --git a/gen_cmdline.sh b/gen_cmdline.sh index 858b850..5503bb5 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -31,6 +31,7 @@ longusage() { echo " --no-xconfig Don't run xconfig after oldconfig" echo " --save-config Save the configuration to /etc/kernels" echo " --no-save-config Don't save the configuration to /etc/kernels" + echo " --virtio Include VirtIO kernel code" echo " Kernel Compile settings" echo " --oldconfig Implies --no-clean and runs a 'make oldconfig'" echo " --clean Run make clean before compilation" @@ -321,6 +322,10 @@ parse_cmdline() { CMD_ZFS=`parse_optbool "$*"` print_info 2 "CMD_ZFS: ${CMD_ZFS}" ;; + --virtio) + CMD_VIRTIO=`parse_optbool "$*"` + print_info 2 "CMD_VIRTIO: ${CMD_VIRTIO}" + ;; --multipath|--no-multipath) CMD_MULTIPATH=`parse_optbool "$*"` if [ "$CMD_MULTIPATH" = "1" -a ! -e /usr/include/libdevmapper.h ] diff --git a/gen_configkernel.sh b/gen_configkernel.sh index b546db1..a69c713 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -147,4 +147,17 @@ config_kernel() { then sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g' fi + + # VirtIO + if isTrue ${CMD_VIRTIO} + then + sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_PARAVIRT_GUEST.*/CONFIG_PARAVIRT_GUEST=y/g' + sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_PCI.*/CONFIG_VIRTIO_PCI=y/g' + sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_BALLOON.*/CONFIG_VIRTIO_BALLOON=y/g' + sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_MMIO.*/CONFIG_VIRTIO_MMIO=y/g' + sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_BLK.*/CONFIG_VIRTIO_BLK=y/g' + sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_SCSI_VIRTIO.*/CONFIG_SCSI_VIRTIO=y/g' + sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_NET.*/CONFIG_VIRTIO_NET=y/g' + sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VHOST_NET.*/CONFIG_VHOST_NET=y/g' + fi } diff --git a/gen_determineargs.sh b/gen_determineargs.sh index eb822b3..c3756d2 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -125,6 +125,7 @@ determine_real_args() { set_config_with_override STRING MDADM_CONFIG CMD_MDADM_CONFIG set_config_with_override BOOL E2FSPROGS CMD_E2FSPROGS "no" set_config_with_override BOOL ZFS CMD_ZFS + set_config_with_override BOOL VIRTIO CMD_VIRTIO "no" set_config_with_override BOOL MULTIPATH CMD_MULTIPATH set_config_with_override BOOL FIRMWARE CMD_FIRMWARE set_config_with_override STRING FIRMWARE_DIR CMD_FIRMWARE_DIR "/lib/firmware"