dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Revert "Revert "Disable autostart for now so usb works."" 

This reverts commit 998acf4d08.
This commit is contained in:
Lorenz Meier 2015-09-12 12:06:45 +02:00
parent c5d1cb1cbc
commit c19fa0c822
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/nuttx/px4_impl_nuttx.cmake
View File

@ -291,21 +291,23 @@ function(px4_nuttx_generate_romfs)
set(romfs_pruner ${CMAKE_SOURCE_DIR}/Tools/px_romfs_pruner.py)
set(bin_to_obj ${CMAKE_SOURCE_DIR}/cmake/nuttx/bin_to_obj.py)
#message(STATUS "temp_dir: ${romfs_temp_dir}")
#message(STATUS "src_dir: ${romfs_src_dir}")
add_custom_command(OUTPUT rc.autostart
COMMAND ${PYTHON_EXECUTABLE} ${romfs_autostart}
-a ${romfs_src_dir}/init.d/
-a ${romfs_src_dir}/init.d
-s rc.autostart
)
add_custom_command(OUTPUT romfs.bin
COMMAND cmake -E remove_directory ${romfs_temp_dir}
COMMAND cmake -E copy_directory ${romfs_src_dir} ${romfs_temp_dir}
COMMAND cmake -E copy rc.autostart ${romfs_temp_dir}/init.d
#TODO add romfs cleanup and pruning
# TODO XXX hack to get nsh to work, copying real
# autostart in currently makes nsh fail over usb
COMMAND cmake -E touch ${romfs_temp_dir}/init.d/rc.autostart
#COMMAND cmake -E copy rc.autostart ${romfs_temp_dir}/init.d
#TODO add romfs cleanup of temp file .~, .swp etc
COMMAND ${PYTHON_EXECUTABLE} ${romfs_pruner}
--folder ${romfs_temp_dir}
COMMAND ${GENROMFS} -f ${CMAKE_CURRENT_BINARY_DIR}/romfs.bin