commit: 979a5e59b766b2defad9f1252baae9524debc99b Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Tue Jul 16 18:49:49 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Tue Jul 16 18:49:49 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=979a5e59
gen_configkernel.sh: config_kernel(): Fix code style Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> gen_configkernel.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index c37a9cb..c0c2439 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -250,8 +250,8 @@ config_kernel() { then print_info 2 "$(get_indent 1)>> Ensure that required kernel options for bcache support are set ..." kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD" "y" - kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BCACHE" "${newcfg_setting}" && - required_kernel_options+=( 'CONFIG_BCACHE' ) + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BCACHE" "${newcfg_setting}" \ + && required_kernel_options+=( 'CONFIG_BCACHE' ) fi # Make sure lvm modules are enabled in the kernel, if --lvm @@ -286,26 +286,26 @@ config_kernel() { kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO" "y" kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD" "y" kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NET" "y" - kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}" && - required_kernel_options+=( 'CONFIG_BLK_DEV_DM' ) - kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_CRYPT" "${cfg_CONFIG_BLK_DEV_DM}" && - required_kernel_options+=( 'CONFIG_DM_CRYPT' ) + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}" \ + && required_kernel_options+=( 'CONFIG_BLK_DEV_DM' ) + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_CRYPT" "${cfg_CONFIG_BLK_DEV_DM}" \ + && required_kernel_options+=( 'CONFIG_DM_CRYPT' ) local cfg_CONFIG_CRYPTO_AES=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES") case "${cfg_CONFIG_CRYPTO_AES}" in y|m) ;; # Do nothing *) cfg_CONFIG_CRYPTO_AES=${newcfg_setting} esac - kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_XTS" "${cfg_CONFIG_CRYPTO_AES}" && - required_kernel_options+=( 'CONFIG_CRYPTO_XTS' ) - kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_SHA256" "${cfg_CONFIG_CRYPTO_AES}" && - required_kernel_options+=( 'CONFIG_CRYPTO_SHA256' ) - kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES" "${cfg_CONFIG_CRYPTO_AES}" && - required_kernel_options+=( 'CONFIG_CRYPTO_AES' ) - kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_USER_API_HASH" "${cfg_CONFIG_CRYPTO_AES}" && - required_kernel_options+=( 'CONFIG_CRYPTO_USER_API_HASH' ) - kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_USER_API_SKCIPHER" "${cfg_CONFIG_CRYPTO_AES}" && - required_kernel_options+=( 'CONFIG_CRYPTO_USER_API_SKCIPHER' ) + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_XTS" "${cfg_CONFIG_CRYPTO_AES}" \ + && required_kernel_options+=( 'CONFIG_CRYPTO_XTS' ) + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_SHA256" "${cfg_CONFIG_CRYPTO_AES}" \ + && required_kernel_options+=( 'CONFIG_CRYPTO_SHA256' ) + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_AES" "${cfg_CONFIG_CRYPTO_AES}" \ + && required_kernel_options+=( 'CONFIG_CRYPTO_AES' ) + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_USER_API_HASH" "${cfg_CONFIG_CRYPTO_AES}" \ + && required_kernel_options+=( 'CONFIG_CRYPTO_USER_API_HASH' ) + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_USER_API_SKCIPHER" "${cfg_CONFIG_CRYPTO_AES}" \ + && required_kernel_options+=( 'CONFIG_CRYPTO_USER_API_SKCIPHER' ) kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_CRYPTO_USER_API_AEAD" "${cfg_CONFIG_CRYPTO_AES}" local cfg_CONFIG_X86=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_X86")