| 1 |
commit: 8a8dfb63344f1131b3960aeaacda24a7711e07c2 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 29 03:59:21 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 29 03:59:21 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8a8dfb63 |
| 7 |
|
| 8 |
gen_configkernel.sh: config_kernel(): Make sure that CONFIG_INITRAMFS_SOURCE is unset |
| 9 |
|
| 10 |
Ensure that CONFIG_INITRAMFS_SOURCE is unset to avoid clashing with --integrated-initramfs. |
| 11 |
|
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
gen_configkernel.sh | 12 ++++++++++++ |
| 15 |
1 file changed, 12 insertions(+) |
| 16 |
|
| 17 |
diff --git a/gen_configkernel.sh b/gen_configkernel.sh |
| 18 |
index 7840491..dd47df6 100755 |
| 19 |
--- a/gen_configkernel.sh |
| 20 |
+++ b/gen_configkernel.sh |
| 21 |
@@ -224,6 +224,18 @@ config_kernel() { |
| 22 |
local -a required_kernel_options |
| 23 |
[ -f "${KCONFIG_MODIFIED_MARKER}" ] && rm "${KCONFIG_MODIFIED_MARKER}" |
| 24 |
|
| 25 |
+ # --integrated-initramfs handling |
| 26 |
+ if isTrue "${INTEGRATED_INITRAMFS}" |
| 27 |
+ then |
| 28 |
+ local cfg_CONFIG_INITRAMFS_SOURCE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE") |
| 29 |
+ if [[ -n "${cfg_CONFIG_INITRAMFS_SOURCE}" && ${#cfg_CONFIG_INITRAMFS_SOURCE} -gt 2 ]] |
| 30 |
+ then |
| 31 |
+ # Checking value length to allow 'CONFIG_INITRAMFS_SOURCE=' and 'CONFIG_INITRAMFS_SOURCE=""' |
| 32 |
+ print_info 2 "$(get_indent 1)>> CONFIG_INITRAMFS_SOURCE is already set; Unsetting to avoid clashing with --integrated-initramfs ..." |
| 33 |
+ kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE" "" |
| 34 |
+ fi |
| 35 |
+ fi |
| 36 |
+ |
| 37 |
# Force this on if we are using --genzimage |
| 38 |
if isTrue "${CMD_GENZIMAGE}" |
| 39 |
then |
Archives