michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: zephyr_module: Remove useless 'west_arg' variable

Browse source 
8cc716792a renamed this variable to lower
case to indicate it's only used locally however WEST_ARG is used as a
parameter of zephyr_module.py in CMakeLists.txt when
CONFIG_BUILD_OUTPUT_META is enabled.
This variable was used when west had some limitation. It does not
really make sense now, so it has been removed and content of west_arg
variable has been added by default.

Signed-off-by: Thomas Gagneret <tgagneret@witekio.com>
This commit is contained in:
Thomas Gagneret 2024-01-17 15:56:59 +01:00 • committed by Henrik Brix Andersen
commit c62dbb1386
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1627,10 +1627,10 @@ if(CONFIG_BUILD_OUTPUT_META)
list(APPEND list(APPEND
post_build_commands post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/zephyr_module.py COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/zephyr_module.py
${WEST_ARG}
${ZEPHYR_MODULES_ARG} ${ZEPHYR_MODULES_ARG}
${EXTRA_ZEPHYR_MODULES_ARG} ${EXTRA_ZEPHYR_MODULES_ARG}
--meta-out ${KERNEL_META_PATH} --meta-out ${KERNEL_META_PATH}
--zephyr-base=${ZEPHYR_BASE}
$<$<BOOL:${CONFIG_BUILD_OUTPUT_META_STATE_PROPAGATE}>:--meta-state-propagate> $<$<BOOL:${CONFIG_BUILD_OUTPUT_META_STATE_PROPAGATE}>:--meta-state-propagate>
) )
list(APPEND list(APPEND

6
cmake/modules/zephyr_module.cmake
View file

@ -48,17 +48,13 @@ set(cmake_modules_file ${CMAKE_BINARY_DIR}/zephyr_modules.txt)
set(cmake_sysbuild_file ${CMAKE_BINARY_DIR}/sysbuild_modules.txt) set(cmake_sysbuild_file ${CMAKE_BINARY_DIR}/sysbuild_modules.txt)
set(zephyr_settings_file ${CMAKE_BINARY_DIR}/zephyr_settings.txt) set(zephyr_settings_file ${CMAKE_BINARY_DIR}/zephyr_settings.txt)
if(WEST)
set(west_arg "--zephyr-base" ${ZEPHYR_BASE})
endif()
if(WEST OR ZEPHYR_MODULES) if(WEST OR ZEPHYR_MODULES)
# Zephyr module uses west, so only call it if west is installed or # Zephyr module uses west, so only call it if west is installed or
# ZEPHYR_MODULES was provided as argument to CMake. # ZEPHYR_MODULES was provided as argument to CMake.
execute_process( execute_process(
COMMAND COMMAND
${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/zephyr_module.py ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/zephyr_module.py
${west_arg} --zephyr-base=${ZEPHYR_BASE}
${ZEPHYR_MODULES_ARG} ${ZEPHYR_MODULES_ARG}
${EXTRA_ZEPHYR_MODULES_ARG} ${EXTRA_ZEPHYR_MODULES_ARG}
--kconfig-out ${kconfig_modules_file} --kconfig-out ${kconfig_modules_file}