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

Force the patches to be applied in order again! 

While the list was sorted, this change serialize the application
   of the patches.

   Moved the disply to the actual application of the patch not
   the configuration step.
This commit is contained in:
David Sidrane 2017-04-07 09:40:08 -10:00 committed by Lorenz Meier
parent f74d6e443e
commit 3435936189
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/nuttx/px4_impl_nuttx.cmake
View File

@ -268,21 +268,23 @@ function(px4_nuttx_add_export)
add_custom_target(nuttx_copy_${CONFIG} DEPENDS ${PX4_BINARY_DIR}/nuttx_copy_${CONFIG}.stamp)
# patch
unset (last_patch )
add_custom_target(nuttx_patch_${CONFIG})
foreach(patch ${nuttx_patches})
get_filename_component(patch_file_name ${patch} NAME)
message(STATUS "${CONFIG} NuttX patch: nuttx-patches/${patch_file_name}")
string(REPLACE "/" "_" patch_name "nuttx_patch_${patch_file_name}-${CONFIG}")
set(patch_stamp ${nuttx_src}/${patch_name}.stamp)
add_custom_command(OUTPUT ${patch_stamp}
COMMAND ${PATCH} -d ${nuttx_src} -s -p1 -N < ${patch}
COMMAND ${TOUCH} ${patch_stamp}
DEPENDS ${DEPENDS} nuttx_copy_${CONFIG} ${patch}
COMMENT "Applying ${patch}")
DEPENDS ${last_patch} ${DEPENDS} nuttx_copy_${CONFIG} ${patch}
USES_TERMINAL
COMMENT "${CONFIG} Applying NuttX patch: nuttx-patches/${patch_file_name}")
add_custom_target(${patch_name} DEPENDS ${patch_stamp})
add_dependencies(nuttx_patch_${CONFIG} ${patch_name})
set (last_patch ${patch_name})
endforeach()
# Read defconfig to see if CONFIG_ARMV7M_STACKCHECK is yes