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 8C04013835A for ; Thu, 16 Jul 2020 15:03:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7C3BE0819; Thu, 16 Jul 2020 15:03:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 94336E0819 for ; Thu, 16 Jul 2020 15:03:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A145834EF59 for ; Thu, 16 Jul 2020 15:03:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7DD732D0 for ; Thu, 16 Jul 2020 15:03:21 +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: <1594909720.d5097672ea7de99c74a43a5fd9e90858f2fee956.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: d5097672ea7de99c74a43a5fd9e90858f2fee956 X-VCS-Branch: master Date: Thu, 16 Jul 2020 15:03:21 +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: 6f2d4407-1692-4f1a-bfb0-a35ee1e11f43 X-Archives-Hash: 25cc747ea39d06acf9677ed2294f862c commit: d5097672ea7de99c74a43a5fd9e90858f2fee956 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Jul 16 01:48:49 2020 +0000 Commit: Thomas Deutschmann gentoo 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 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