[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     d5097672ea7de99c74a43a5fd9e90858f2fee956
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 01:48:49 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:28:40 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d5097672

gen_configkernel.sh: config_kernel(): Don't set CONFIG_CRYPTO_AES_{X86_64,586} for >=linux-5.4

Options were removed in linux-5.4 [Link 1].

Link 1: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1d2c3279311e4f03fcf164e1366f2fda9f4bfccf
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

merge

 gen_configkernel.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 7804949..1a7d3d3 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -533,8 +533,15 @@ config_kernel() {
 			then
 				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_SHA1_SSSE3" "${cfg_CONFIG_CRYPTO_AES}"
 				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_SHA256_SSSE3" "${cfg_CONFIG_CRYPTO_AES}"
-				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES_X86_64" "${cfg_CONFIG_CRYPTO_AES}"
-			else
+
+				if [ ${KV_NUMERIC} -lt 5004 ]
+				then
+					kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES_X86_64" "${cfg_CONFIG_CRYPTO_AES}"
+				fi
+			fi
+
+			if [ ${KV_NUMERIC} -lt 5004 ]
+			then
 				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES_586" "${cfg_CONFIG_CRYPTO_AES}"
 			fi
 		fi