diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2019-12-29 04:59:21 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2019-12-29 04:59:21 +0100 |
| commit | 8a8dfb63344f1131b3960aeaacda24a7711e07c2 (patch) | |
| tree | 0abd2fbf3d7aa58b3f1fa7bd28c391429b904d04 | |
| parent | gen_initramfs.sh: create_initramfs(): Fix integrated initramfs creation (diff) | |
| download | genkernel-8a8dfb63.tar.gz genkernel-8a8dfb63.tar.bz2 genkernel-8a8dfb63.zip | |
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@gentoo.org>
| -rwxr-xr-x | gen_configkernel.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 7840491a..dd47df65 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 |