| 1 |
commit: ad5d9a6e905e19b04822cc20cc00267379c6e27a |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 29 15:33:20 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 29 15:34:41 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ad5d9a6e |
| 7 |
|
| 8 |
gen_configkernel.sh: config_kernel(): Use global KV_NUMERIC variable |
| 9 |
|
| 10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 11 |
|
| 12 |
gen_configkernel.sh | 22 +++++++++++----------- |
| 13 |
1 file changed, 11 insertions(+), 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gen_configkernel.sh b/gen_configkernel.sh |
| 16 |
index 5a4b5ce..bde9fc5 100755 |
| 17 |
--- a/gen_configkernel.sh |
| 18 |
+++ b/gen_configkernel.sh |
| 19 |
@@ -581,7 +581,7 @@ config_kernel() { |
| 20 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_NET" "${cfg_CONFIG_HYPERV}" \ |
| 21 |
&& required_kernel_options+=( 'CONFIG_HYPERV_NET' ) |
| 22 |
|
| 23 |
- if [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4014 ] |
| 24 |
+ if [ ${KV_NUMERIC} -ge 4014 ] |
| 25 |
then |
| 26 |
local cfg_CONFIG_VSOCKETS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VSOCKETS") |
| 27 |
case "${cfg_CONFIG_VSOCKETS}" in |
| 28 |
@@ -595,16 +595,16 @@ config_kernel() { |
| 29 |
|
| 30 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_KEYBOARD" "${cfg_CONFIG_HYPERV}" |
| 31 |
|
| 32 |
- [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4006 ] && |
| 33 |
+ [ ${KV_NUMERIC} -ge 4006 ] && |
| 34 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_PCI_HYPERV" "${cfg_CONFIG_HYPERV}" |
| 35 |
|
| 36 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_HYPERV" "${cfg_CONFIG_HYPERV}" |
| 37 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HID_HYPERV_MOUSE" "${cfg_CONFIG_HYPERV}" |
| 38 |
|
| 39 |
- [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4010 ] && |
| 40 |
+ [ ${KV_NUMERIC} -ge 4010 ] && |
| 41 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_UIO_HV_GENERIC" "${cfg_CONFIG_HYPERV}" |
| 42 |
|
| 43 |
- [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4012 ] && |
| 44 |
+ [ ${KV_NUMERIC} -ge 4012 ] && |
| 45 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_HYPERV_TSCPAGE" "y" |
| 46 |
fi |
| 47 |
|
| 48 |
@@ -677,7 +677,7 @@ config_kernel() { |
| 49 |
esac |
| 50 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VHOST_NET" "${cfg_CONFIG_VHOST_NET}" |
| 51 |
|
| 52 |
- if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4006 ] |
| 53 |
+ if [ ${KV_NUMERIC} -ge 4006 ] |
| 54 |
then |
| 55 |
local cfg_CONFIG_FW_CFG_SYSFS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FW_CFG_SYSFS") |
| 56 |
case "${cfg_CONFIG_FW_CFG_SYSFS}" in |
| 57 |
@@ -717,7 +717,7 @@ config_kernel() { |
| 58 |
&& required_kernel_options+=( 'CONFIG_VIRTIO_NET' ) |
| 59 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_PCI" "${newvirtio_setting}" |
| 60 |
|
| 61 |
- if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4011 ] |
| 62 |
+ if [ ${KV_NUMERIC} -ge 4011 ] |
| 63 |
then |
| 64 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_BLK_SCSI" "y" |
| 65 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_MQ_VIRTIO" "y" |
| 66 |
@@ -731,7 +731,7 @@ config_kernel() { |
| 67 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_MMIO" "${newvirtio_setting}" |
| 68 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES" "y" |
| 69 |
|
| 70 |
- if [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4008 ] |
| 71 |
+ if [ ${KV_NUMERIC} -ge 4008 ] |
| 72 |
then |
| 73 |
local cfg_CONFIG_VSOCKETS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VSOCKETS") |
| 74 |
case "${cfg_CONFIG_VSOCKETS}" in |
| 75 |
@@ -744,7 +744,7 @@ config_kernel() { |
| 76 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_VSOCKETS_COMMON" "${newvirtio_setting}" |
| 77 |
fi |
| 78 |
|
| 79 |
- [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -ge 4010 ] && |
| 80 |
+ [ ${KV_NUMERIC} -ge 4010 ] && |
| 81 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_DEV_VIRTIO" "${newvirtio_setting}" |
| 82 |
fi |
| 83 |
|
| 84 |
@@ -760,15 +760,15 @@ config_kernel() { |
| 85 |
print_info 2 "$(get_indent 1)>> Ensure that required kernel options for early microcode loading support are set ..." |
| 86 |
kconfigs_microcode+=( 'CONFIG_MICROCODE' ) |
| 87 |
kconfigs_microcode+=( 'CONFIG_MICROCODE_OLD_INTERFACE' ) |
| 88 |
- [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs_microcode+=( 'CONFIG_MICROCODE_EARLY' ) |
| 89 |
+ [ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode+=( 'CONFIG_MICROCODE_EARLY' ) |
| 90 |
|
| 91 |
# Intel |
| 92 |
kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL' ) |
| 93 |
- [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL_EARLY' ) |
| 94 |
+ [ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL_EARLY' ) |
| 95 |
|
| 96 |
# AMD |
| 97 |
kconfigs_microcode_amd=( 'CONFIG_MICROCODE_AMD' ) |
| 98 |
- [ $(($KV_MAJOR * 1000 + ${KV_MINOR})) -le 4003 ] && kconfigs_microcode_amd+=( 'CONFIG_MICROCODE_AMD_EARLY' ) |
| 99 |
+ [ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode_amd+=( 'CONFIG_MICROCODE_AMD_EARLY' ) |
| 100 |
|
| 101 |
[[ "${MICROCODE}" == all ]] && kconfigs_microcode+=( ${kconfigs_microcode_amd[@]} ${kconfigs_microcode_intel[@]} ) |
| 102 |
[[ "${MICROCODE}" == amd ]] && kconfigs_microcode+=( ${kconfigs_microcode_amd[@]} ) |
Archives