(nuttx) branch master updated: Revert "cmake: normalize .config on reconfigure"

[simbit18]

This is an automated email from the ASF dual-hosted git repository.

simbit18 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new bf45e12fdd7 Revert "cmake: normalize .config on reconfigure"
bf45e12fdd7 is described below

commit bf45e12fdd7b1ac9e3cfdbbd4125e7ff3cdb0d37
Author: raiden00pl <raide...@railab.me>
AuthorDate: Wed Aug 12 21:21:37 2026 +0200

    Revert "cmake: normalize .config on reconfigure"
    
    This reverts commit 9b0d46c222907112e5127591e05cb1e39f7cb1de.
    
    This change was made to fix a problem in NTFC with kernel build,
    but it introduces an incompatibility with make.
    
    We are reverting this change and the NTFC issue will be resolved
    on the NTFC side.
    
    Signed-off-by: raiden00pl <raide...@railab.me>
---
 CMakeLists.txt            | 16 +++-------------
 cmake/nuttx_kconfig.cmake |  7 ++-----
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aec00333606..820c5a4faa7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -368,9 +368,6 @@ if(NOT EXISTS ${NUTTX_BINARY_DIR}/.config OR NOT 
"${NUTTX_DEFCONFIG}" STREQUAL
   # Do olddefconfig step to expand the abbreviated defconfig into normal config
   nuttx_olddefconfig()
 
-  # save the orig compressed formatted defconfig at the very beginning
-  nuttx_save_defconfig_orig()
-
   file(RENAME ${NUTTX_BINARY_DIR}/.config.compressed
        ${NUTTX_BINARY_DIR}/.config)
   set(ENV{KCONFIG_CONFIG} ${NUTTX_BINARY_DIR}/.config)
@@ -388,11 +385,9 @@ if(NOT EXISTS ${NUTTX_BINARY_DIR}/.config OR NOT 
"${NUTTX_DEFCONFIG}" STREQUAL
   endif()
   file(WRITE ${NUTTX_BINARY_DIR}/.config "${_config_init_content}")
 
-  # store original expanded .config; plain copy so .config does not become a
-  # configure dependency: the compiler cannot change after the first configure,
-  # so a modified .config must not reconfigure mid-build
-  execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${NUTTX_BINARY_DIR}/.config
-                          ${NUTTX_BINARY_DIR}/.config.orig)
+  # store original expanded .config
+  configure_file(${NUTTX_BINARY_DIR}/.config ${NUTTX_BINARY_DIR}/.config.orig
+                 COPYONLY)
 
   set(NUTTX_DEFCONFIG_SAVED
       ${NUTTX_DEFCONFIG}
@@ -416,11 +411,6 @@ if(NOT EXISTS ${NUTTX_BINARY_DIR}/.config OR NOT 
"${NUTTX_DEFCONFIG}" STREQUAL
   message(STATUS "  Board:  ${NUTTX_BOARD}")
   message(STATUS "  Config: ${NUTTX_CONFIG}")
   message(STATUS "  Appdir: ${NUTTX_APPS_DIR}")
-else()
-  # Normalize user modifications to .config (e.g. kconfig-tweak) so dependent
-  # defaults materialize, as the Make flow does on each build
-  set(ENV{KCONFIG_CONFIG} ${NUTTX_BINARY_DIR}/.config)
-  nuttx_olddefconfig()
 endif()
 
 # declare global custom targets at very beginning `nuttx_global` is used to 
hold
diff --git a/cmake/nuttx_kconfig.cmake b/cmake/nuttx_kconfig.cmake
index 94be42ddd83..9247dad5dfe 100644
--- a/cmake/nuttx_kconfig.cmake
+++ b/cmake/nuttx_kconfig.cmake
@@ -216,12 +216,8 @@ function(nuttx_olddefconfig)
         "nuttx_olddefconfig: Failed to initialize Kconfig configuration: 
${KCONFIG_OUTPUT}"
     )
   endif()
-endfunction()
-
-# save the orig compressed formatted defconfig at the very beginning; only 
valid
-# during the initial configure while .config.compressed exists
 
-function(nuttx_save_defconfig_orig)
+  # save the orig compressed formatted defconfig at the very beginning
   execute_process(COMMAND savedefconfig --out ${NUTTX_BINARY_DIR}/defconfig.tmp
                   WORKING_DIRECTORY ${NUTTX_DIR})
 
@@ -231,6 +227,7 @@ function(nuttx_save_defconfig_orig)
       ${NUTTX_BINARY_DIR}/.config.compressed ${NUTTX_BINARY_DIR}/defconfig.tmp
       ${NUTTX_BINARY_DIR}/defconfig.orig
     WORKING_DIRECTORY ${NUTTX_DIR})
+
 endfunction()
 
 function(nuttx_setconfig)