diff options
author | Thomas Deutschmann <whissi@gentoo.org> | 2019-03-26 04:39:06 +0100 |
---|---|---|
committer | Thomas Deutschmann <whissi@gentoo.org> | 2019-03-26 08:12:05 +0100 |
commit | ea29977b438633337a5ef69d8be318c038fd96b6 (patch) | |
tree | a9829e6d7614ec08613000139472b639ab8f83f5 /gen_configkernel.sh | |
parent | get_KV(): export KV_MAJOR & KV_MINOR (diff) | |
download | genkernel-ea29977b438633337a5ef69d8be318c038fd96b6.tar.gz genkernel-ea29977b438633337a5ef69d8be318c038fd96b6.tar.bz2 genkernel-ea29977b438633337a5ef69d8be318c038fd96b6.zip |
config_kernel(): rewrite --genzimage handling
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'gen_configkernel.sh')
-rwxr-xr-x | gen_configkernel.sh | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/gen_configkernel.sh b/gen_configkernel.sh index b115344a..a8627b4f 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -127,8 +127,24 @@ config_kernel() { # Force this on if we are using --genzimage if isTrue "${CMD_GENZIMAGE}" then + print_info 1 "$(getIndent 1)>> Ensure that required kernel options for --genzimage are set..." # Make sure Ext2 support is on... - kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y" + cfg_CONFIG_EXT2_FS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS") + if ! isTrue "${cfg_CONFIG_EXT2_FS}" + then + cfg_CONFIG_EXT4_USE_FOR_EXT2=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT4_USE_FOR_EXT2") + if ! isTrue "${cfg_CONFIG_EXT4_USE_FOR_EXT2}" + then + cfg_CONFIG_EXT4_FS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT4_FS") + if isTrue "${cfg_CONFIG_EXT4_FS}" + then + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT4_USE_FOR_EXT2" "y" + else + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y" + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y" + fi + fi + fi fi # Do we support modules at all? |