From 6f0afc150c14654c8832497c08948dee9ff12fa6 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Mon, 30 Dec 2024 19:09:23 +0100 Subject: [PATCH] kernel-config: switch to exporting defconfig's for all .config files - this affects `rewrite-kernel-config` and `kernel-config` CLIs - this does not actually change the .config's we have, that will happen later / gradually as configs are rewritten - no more `.defconfig` files are produced (they were in gitignore) --- lib/functions/compilation/kernel-config.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/functions/compilation/kernel-config.sh b/lib/functions/compilation/kernel-config.sh index 6ea0e69775..c75e61e76d 100644 --- a/lib/functions/compilation/kernel-config.sh +++ b/lib/functions/compilation/kernel-config.sh @@ -135,20 +135,18 @@ function kernel_config_finalize() { } function kernel_config_export() { - # store kernel config in easily reachable place + # export defconfig + run_kernel_make savedefconfig + + # store kernel defconfig in easily reachable place (output dir) mkdir -p "${DEST}"/config - display_alert "Exporting new kernel config" "$DEST/config/$LINUXCONFIG.config" "info" - run_host_command_logged cp -pv .config "${DEST}/config/${LINUXCONFIG}.config" + display_alert "Exporting new kernel defconfig" "$DEST/config/$LINUXCONFIG.config" "info" + run_host_command_logged cp -pv defconfig "${DEST}/config/${LINUXCONFIG}.config" # store back into original LINUXCONFIG too, if it came from there, so it's pending commits when done. if [[ "${kernel_config_source_filename}" != "" ]]; then display_alert "Exporting new kernel config - git commit pending" "${kernel_config_source_filename}" "info" - run_host_command_logged cp -pv .config "${kernel_config_source_filename}" - - # export defconfig - run_kernel_make savedefconfig - run_host_command_logged cp -pv defconfig "${DEST}/config/${LINUXCONFIG}.defconfig" - run_host_command_logged cp -pv defconfig "${kernel_config_source_filename}.defconfig" + run_host_command_logged cp -pv defconfig "${kernel_config_source_filename}" fi }