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 00A6A138335 for ; Wed, 2 Oct 2019 22:45:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A354AE089D; Wed, 2 Oct 2019 22:45:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 7DAD2E089D for ; Wed, 2 Oct 2019 22:45:29 +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 63DF934B7C6 for ; Wed, 2 Oct 2019 22:45:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1417D825 for ; Wed, 2 Oct 2019 22:45:27 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1569771281.ad5d9a6e905e19b04822cc20cc00267379c6e27a.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_configkernel.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: ad5d9a6e905e19b04822cc20cc00267379c6e27a X-VCS-Branch: master Date: Wed, 2 Oct 2019 22:45: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 89c1e767-77c6-41e2-b496-86df80f36ba3 X-Archives-Hash: 4689b727d318bba3db5992b2c676afb8 commit: ad5d9a6e905e19b04822cc20cc00267379c6e27a Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Sep 29 15:33:20 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Sep 29 15:34:41 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ad5d9a6e gen_configkernel.sh: config_kernel(): Use global KV_NUMERIC variable Signed-off-by: Thomas Deutschmann gentoo.org> gen_configkernel.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 5a4b5ce..bde9fc5 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -581,7 +581,7 @@ config_kernel() { kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_NET" "${cfg_CONFIG_HYPERV}" \ && required_kernel_options+=( 'CONFIG_HYPERV_NET' ) - if [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4014 ] + if [ ${KV_NUMERIC} -ge 4014 ] then local cfg_CONFIG_VSOCKETS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VSOCKETS") case "${cfg_CONFIG_VSOCKETS}" in @@ -595,16 +595,16 @@ config_kernel() { kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_KEYBOARD" "${cfg_CONFIG_HYPERV}" - [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4006 ] && + [ ${KV_NUMERIC} -ge 4006 ] && kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_PCI_HYPERV" "${cfg_CONFIG_HYPERV}" kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_HYPERV" "${cfg_CONFIG_HYPERV}" kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HID_HYPERV_MOUSE" "${cfg_CONFIG_HYPERV}" - [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4010 ] && + [ ${KV_NUMERIC} -ge 4010 ] && kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UIO_HV_GENERIC" "${cfg_CONFIG_HYPERV}" - [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4012 ] && + [ ${KV_NUMERIC} -ge 4012 ] && kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_TSCPAGE" "y" fi @@ -677,7 +677,7 @@ config_kernel() { esac kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VHOST_NET" "${cfg_CONFIG_VHOST_NET}" - if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4006 ] + if [ ${KV_NUMERIC} -ge 4006 ] then local cfg_CONFIG_FW_CFG_SYSFS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FW_CFG_SYSFS") case "${cfg_CONFIG_FW_CFG_SYSFS}" in @@ -717,7 +717,7 @@ config_kernel() { && required_kernel_options+=( 'CONFIG_VIRTIO_NET' ) kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_PCI" "${newvirtio_setting}" - if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4011 ] + if [ ${KV_NUMERIC} -ge 4011 ] then kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_BLK_SCSI" "y" kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_MQ_VIRTIO" "y" @@ -731,7 +731,7 @@ config_kernel() { kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_MMIO" "${newvirtio_setting}" kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES" "y" - if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4008 ] + if [ ${KV_NUMERIC} -ge 4008 ] then local cfg_CONFIG_VSOCKETS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VSOCKETS") case "${cfg_CONFIG_VSOCKETS}" in @@ -744,7 +744,7 @@ config_kernel() { kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_VSOCKETS_COMMON" "${newvirtio_setting}" fi - [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4010 ] && + [ ${KV_NUMERIC} -ge 4010 ] && kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_DEV_VIRTIO" "${newvirtio_setting}" fi @@ -760,15 +760,15 @@ config_kernel() { print_info 2 "$(get_indent 1)>> Ensure that required kernel options for early microcode loading support are set ..." kconfigs_microcode+=( 'CONFIG_MICROCODE' ) kconfigs_microcode+=( 'CONFIG_MICROCODE_OLD_INTERFACE' ) - [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs_microcode+=( 'CONFIG_MICROCODE_EARLY' ) + [ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode+=( 'CONFIG_MICROCODE_EARLY' ) # Intel kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL' ) - [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL_EARLY' ) + [ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL_EARLY' ) # AMD kconfigs_microcode_amd=( 'CONFIG_MICROCODE_AMD' ) - [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs_microcode_amd+=( 'CONFIG_MICROCODE_AMD_EARLY' ) + [ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode_amd+=( 'CONFIG_MICROCODE_AMD_EARLY' ) [[ "${MICROCODE}" == all ]] && kconfigs_microcode+=( ${kconfigs_microcode_amd[@]} ${kconfigs_microcode_intel[@]} ) [[ "${MICROCODE}" == amd ]] && kconfigs_microcode+=( ${kconfigs_microcode_amd[@]} )