From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CA8481396D9 for ; Wed, 15 Nov 2017 03:08:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0191E0E63; Wed, 15 Nov 2017 03:08:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7127FE0E2C for ; Wed, 15 Nov 2017 03:08:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB52833D3C7 for ; Wed, 15 Nov 2017 03:08:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 842CB9B12 for ; Wed, 15 Nov 2017 03:08:29 +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: <1510715117.fd38ac4fb57ca9bc95ab9511c6948d326bdf48de.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: /, doc/ X-VCS-Repository: proj/genkernel X-VCS-Files: doc/genkernel.8.txt gen_cmdline.sh gen_configkernel.sh gen_determineargs.sh X-VCS-Directories: / doc/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: fd38ac4fb57ca9bc95ab9511c6948d326bdf48de X-VCS-Branch: master Date: Wed, 15 Nov 2017 03:08:29 +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: ea148f28-7658-4a7a-9a49-15d425b5de79 X-Archives-Hash: 27703fba1e35040098f89000b67c435f commit: fd38ac4fb57ca9bc95ab9511c6948d326bdf48de Author: Daniel Robbins funtoo org> AuthorDate: Sun Nov 12 03:24:10 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Wed Nov 15 03:05:17 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fd38ac4f Add --hyperv option for Microsoft Hyper-V. Enable within kernel image to ensure modules are available early at boot. doc/genkernel.8.txt | 3 +++ gen_cmdline.sh | 8 +++++++- gen_configkernel.sh | 15 +++++++++++++++ gen_determineargs.sh | 1 + 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt index a0c638e..7c653eb 100644 --- a/doc/genkernel.8.txt +++ b/doc/genkernel.8.txt @@ -303,6 +303,9 @@ INITIALIZATION *--*[*no-*]*iscsi*:: Includes or excludes iSCSI support +*--*[*no-*]*hyperv*:: + Includes or excludes Microsoft Hyper-V support + *--*[*no-*]*ssh*:: Includes or excludes SSH (dropbear) support for remote LUKS keys. diff --git a/gen_cmdline.sh b/gen_cmdline.sh index 83b3829..1091d4d 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -114,7 +114,9 @@ longusage() { echo " --no-multipath Exclude Multipath support" echo " --iscsi Include iSCSI support" echo " --no-iscsi Exclude iSCSI support" - echo " --ssh Include SSH (dropbear) support" + echo " --hyperv Include Microsoft Hyper-V support" + echo " --no-hyperv Exclude Microsoft Hyper-V support" + echo " --ssh Include SSH (dropbear) support" echo " --no-ssh Exclude SSH (dropbear) support" echo " --bootloader=grub Add new kernel to GRUB configuration" echo " --linuxrc= Specifies a user created linuxrc" @@ -404,6 +406,10 @@ parse_cmdline() { CMD_ISCSI=`parse_optbool "$*"` print_info 2 "CMD_ISCSI: ${CMD_ISCSI}" ;; + --hyperv|--no-hyperv) + CMD_ISCSI=`parse_optbool "$*"` + print_info 2 "CMD_HYPERV: ${CMD_HYPERV}" + ;; --ssh|--no-ssh) CMD_SSH=`parse_optbool "$*"` print_info 2 "CMD_SSH: ${CMD_SSH}" diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 26e4610..697c478 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -219,6 +219,21 @@ config_kernel() { kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS" "${cfg_CONFIG_SCSI_ISCSI_ATTRS}" fi + # Make sure HyperV modules are enabled in the kernel, if --hyperv + if isTrue ${CMD_HYPERV} + then + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV" "y" + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_UTILS" "y" + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_BALLOON" "y" + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_STORAGE" "y" + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_NET" "y" + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_KEYBOARD" "y" + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_PCI_HYPERV" "y" + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_HYPERV" "y" + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HID_HYPERV_MOUSE" "y" + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UIO_HV_GENERIC" "y" + fi + if isTrue ${SPLASH} then kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_SPLASH" "y" diff --git a/gen_determineargs.sh b/gen_determineargs.sh index fe9f85b..b686fca 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -118,6 +118,7 @@ determine_real_args() { set_config_with_override BOOL LVM CMD_LVM set_config_with_override BOOL DMRAID CMD_DMRAID set_config_with_override BOOL ISCSI CMD_ISCSI + set_config_with_override BOOL HYPERV CMD_HYPERV set_config_with_override BOOL BUSYBOX CMD_BUSYBOX "yes" set_config_with_override BOOL NFS CMD_NFS "yes" set_config_with_override BOOL MICROCODE CMD_MICROCODE