Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-29 03:36:07 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

ROMFS: fix some cmake issues

Browse Source 
- every incremental rebuild extended ${config_romfs_files_list}, the
  chached variable was never reset
- cmake -E copy_directory did not remove deleted files

remaining issue: removing a file from the ROMFS & px4_add_romfs_files()
does not trigger the px_romfs_pruner.py COMMANDs to be re-executed.
This commit is contained in:
Beat Küng
2018-07-23 17:32:21 +02:00
committed by Lorenz Meier
parent 8b3716c0df
commit 3f615695b6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/CMakeLists.txt
+2 -1
View File
@@ -33,7 +33,7 @@
message(STATUS "ROMFS: ${config_romfs_root}") message(STATUS "ROMFS: ${config_romfs_root}")
set(config_romfs_files_list) unset(config_romfs_files_list CACHE)
set(romfs_src_dir ${PX4_SOURCE_DIR}/ROMFS/${config_romfs_root}) set(romfs_src_dir ${PX4_SOURCE_DIR}/ROMFS/${config_romfs_root})
set(romfs_temp_dir ${PX4_BINARY_DIR}/genromfs/${config_romfs_root}) set(romfs_temp_dir ${PX4_BINARY_DIR}/genromfs/${config_romfs_root})
@@ -72,6 +72,7 @@ add_subdirectory(${romfs_src_dir})
# directory setup # directory setup
# copy all romfs files, process airframes, prune comments # copy all romfs files, process airframes, prune comments
add_custom_command(OUTPUT ${romfs_temp_dir}/init.d/rcS ${romfs_temp_dir}/init.d/rc.autostart add_custom_command(OUTPUT ${romfs_temp_dir}/init.d/rcS ${romfs_temp_dir}/init.d/rc.autostart
COMMAND cmake -E remove_directory ${romfs_temp_dir}
COMMAND cmake -E copy_directory ${romfs_src_dir} ${romfs_temp_dir} COMMAND cmake -E copy_directory ${romfs_src_dir} ${romfs_temp_dir}
COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_airframes.py COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_airframes.py
-a ${romfs_temp_dir}/init.d -a ${romfs_temp_dir}/init.d