From c19fa0c8225b2ca3292938783f9ef05731f978d1 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 12 Sep 2015 12:06:45 +0200 Subject: [PATCH] Revert "Revert "Disable autostart for now so usb works."" This reverts commit 998acf4d0802fe031725ba17d339bab20fcaa677. --- cmake/nuttx/px4_impl_nuttx.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/nuttx/px4_impl_nuttx.cmake b/cmake/nuttx/px4_impl_nuttx.cmake index 6c2dbaf25a..15a304fdb9 100644 --- a/cmake/nuttx/px4_impl_nuttx.cmake +++ b/cmake/nuttx/px4_impl_nuttx.cmake @@ -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