Disable autostart for now so usb works.

This commit is contained in:
James Goppert
2015-09-12 02:22:27 -04:00
parent 4c3f47a003
commit b2c67a4cf9
+6 -4
View File
@@ -291,21 +291,23 @@ function(px4_nuttx_generate_romfs)
set(romfs_pruner ${CMAKE_SOURCE_DIR}/Tools/px_romfs_pruner.py) set(romfs_pruner ${CMAKE_SOURCE_DIR}/Tools/px_romfs_pruner.py)
set(bin_to_obj ${CMAKE_SOURCE_DIR}/cmake/nuttx/bin_to_obj.py) set(bin_to_obj ${CMAKE_SOURCE_DIR}/cmake/nuttx/bin_to_obj.py)
#message(STATUS "temp_dir: ${romfs_temp_dir}") #message(STATUS "temp_dir: ${romfs_temp_dir}")
#message(STATUS "src_dir: ${romfs_src_dir}") #message(STATUS "src_dir: ${romfs_src_dir}")
add_custom_command(OUTPUT rc.autostart add_custom_command(OUTPUT rc.autostart
COMMAND ${PYTHON_EXECUTABLE} ${romfs_autostart} COMMAND ${PYTHON_EXECUTABLE} ${romfs_autostart}
-a ${romfs_src_dir}/init.d/ -a ${romfs_src_dir}/init.d
-s rc.autostart -s rc.autostart
) )
add_custom_command(OUTPUT romfs.bin add_custom_command(OUTPUT romfs.bin
COMMAND cmake -E remove_directory ${romfs_temp_dir} 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 cmake -E copy rc.autostart ${romfs_temp_dir}/init.d # TODO XXX hack to get nsh to work, copying real
#TODO add romfs cleanup and pruning # 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} COMMAND ${PYTHON_EXECUTABLE} ${romfs_pruner}
--folder ${romfs_temp_dir} --folder ${romfs_temp_dir}
COMMAND ${GENROMFS} -f ${CMAKE_CURRENT_BINARY_DIR}/romfs.bin COMMAND ${GENROMFS} -f ${CMAKE_CURRENT_BINARY_DIR}/romfs.bin