Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-01 20:28:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cmake/romfs: invoke passwd helper scripts via POSIX shell

Browse source 
Run update_romfs_password.sh, check_passwd_keys.sh, and
gen_passwd_keys.sh through an explicit sh/bash interpreter so CMake
configure works on Linux, macOS, MSYS2, and Cygwin instead of relying
on direct script execution.

Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
This commit is contained in:
Abhishek Mishra 2026-07-08 08:32:10 +00:00 • committed by Xiang Xiao
parent e9c9cba51d
commit d75d713165
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
cmake/nuttx_add_romfs.cmake
View file

@ -284,8 +284,23 @@ function(process_all_directory_romfs)
# Auto-generate /etc/passwd at build time if configured
if(CONFIG_BOARD_ETC_ROMFS_PASSWD_ENABLE)
execute_process(COMMAND "${NUTTX_DIR}/tools/update_romfs_password.sh"
"${NUTTX_DIR}/.config" RESULT_VARIABLE _cred_rc)
# Host tools are POSIX shell scripts (same as Make/configure.sh). Invoke
# them via an explicit interpreter so CMake works on Linux, macOS, MSYS2,
# and Cygwin — not only when the script path is marked executable.
if(NOT NUTTX_POSIX_SHELL)
find_program(NUTTX_POSIX_SHELL NAMES sh bash)
endif()
if(NOT NUTTX_POSIX_SHELL)
message(
FATAL_ERROR
"ROMFS passwd generation requires a POSIX shell (sh or bash). "
"On Windows, configure and build from the MSYS2 or Cygwin environment."
)
endif()
execute_process(
COMMAND ${NUTTX_POSIX_SHELL} "${NUTTX_DIR}/tools/update_romfs_password.sh"
"${NUTTX_DIR}/.config" RESULT_VARIABLE _cred_rc)
if(NOT _cred_rc EQUAL 0)
message(FATAL_ERROR "update_romfs_password.sh failed (rc=${_cred_rc})")
endif()
@ -362,7 +377,8 @@ function(process_all_directory_romfs)
# so the firmware uses the correct keys automatically.
execute_process(
COMMAND "${NUTTX_DIR}/tools/check_passwd_keys.sh" "${NUTTX_DIR}/.config"
COMMAND ${NUTTX_POSIX_SHELL} "${NUTTX_DIR}/tools/check_passwd_keys.sh"
"${NUTTX_DIR}/.config"
OUTPUT_VARIABLE _passwd_keys_need_setup
OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE _check_rc)
@ -377,7 +393,8 @@ function(process_all_directory_romfs)
if(CONFIG_BOARD_ETC_ROMFS_PASSWD_RANDOMIZE_KEYS)
# Generate keys and write to .config (no key values printed here)
execute_process(
COMMAND "${NUTTX_DIR}/tools/gen_passwd_keys.sh" "${NUTTX_DIR}/.config"
COMMAND ${NUTTX_POSIX_SHELL} "${NUTTX_DIR}/tools/gen_passwd_keys.sh"
"${NUTTX_DIR}/.config"
RESULT_VARIABLE _gen_rc
OUTPUT_QUIET ERROR_QUIET)
if(NOT _gen_rc EQUAL 0)