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

[Thomas Deutschmann]

commit:     8a8dfb63344f1131b3960aeaacda24a7711e07c2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 03:59:21 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 03:59:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8a8dfb63

gen_configkernel.sh: config_kernel(): Make sure that CONFIG_INITRAMFS_SOURCE is 
unset

Ensure that CONFIG_INITRAMFS_SOURCE is unset to avoid clashing with 
--integrated-initramfs.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 7840491..dd47df6 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -224,6 +224,18 @@ config_kernel() {
        local -a required_kernel_options
        [ -f "${KCONFIG_MODIFIED_MARKER}" ] && rm "${KCONFIG_MODIFIED_MARKER}"
 
+       # --integrated-initramfs handling
+       if isTrue "${INTEGRATED_INITRAMFS}"
+       then
+               local cfg_CONFIG_INITRAMFS_SOURCE=$(kconfig_get_opt 
"${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE")
+               if [[ -n "${cfg_CONFIG_INITRAMFS_SOURCE}" && 
${#cfg_CONFIG_INITRAMFS_SOURCE} -gt 2 ]]
+               then
+                       # Checking value length to allow 
'CONFIG_INITRAMFS_SOURCE=' and 'CONFIG_INITRAMFS_SOURCE=""'
+                       print_info 2 "$(get_indent 1)>> CONFIG_INITRAMFS_SOURCE 
is already set; Unsetting to avoid clashing with --integrated-initramfs ..."
+                       kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" 
"CONFIG_INITRAMFS_SOURCE" ""
+               fi
+       fi
+
        # Force this on if we are using --genzimage
        if isTrue "${CMD_GENZIMAGE}"
        then