forked from Archive/PX4-Autopilot
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:
parent
f74d6e443e
commit
3435936189
|
@ -268,21 +268,23 @@ function(px4_nuttx_add_export)
|
||||||
add_custom_target(nuttx_copy_${CONFIG} DEPENDS ${PX4_BINARY_DIR}/nuttx_copy_${CONFIG}.stamp)
|
add_custom_target(nuttx_copy_${CONFIG} DEPENDS ${PX4_BINARY_DIR}/nuttx_copy_${CONFIG}.stamp)
|
||||||
|
|
||||||
# patch
|
# patch
|
||||||
|
unset (last_patch )
|
||||||
add_custom_target(nuttx_patch_${CONFIG})
|
add_custom_target(nuttx_patch_${CONFIG})
|
||||||
foreach(patch ${nuttx_patches})
|
foreach(patch ${nuttx_patches})
|
||||||
get_filename_component(patch_file_name ${patch} NAME)
|
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}")
|
string(REPLACE "/" "_" patch_name "nuttx_patch_${patch_file_name}-${CONFIG}")
|
||||||
set(patch_stamp ${nuttx_src}/${patch_name}.stamp)
|
set(patch_stamp ${nuttx_src}/${patch_name}.stamp)
|
||||||
|
|
||||||
add_custom_command(OUTPUT ${patch_stamp}
|
add_custom_command(OUTPUT ${patch_stamp}
|
||||||
COMMAND ${PATCH} -d ${nuttx_src} -s -p1 -N < ${patch}
|
COMMAND ${PATCH} -d ${nuttx_src} -s -p1 -N < ${patch}
|
||||||
COMMAND ${TOUCH} ${patch_stamp}
|
COMMAND ${TOUCH} ${patch_stamp}
|
||||||
DEPENDS ${DEPENDS} nuttx_copy_${CONFIG} ${patch}
|
DEPENDS ${last_patch} ${DEPENDS} nuttx_copy_${CONFIG} ${patch}
|
||||||
COMMENT "Applying ${patch}")
|
USES_TERMINAL
|
||||||
|
COMMENT "${CONFIG} Applying NuttX patch: nuttx-patches/${patch_file_name}")
|
||||||
|
|
||||||
add_custom_target(${patch_name} DEPENDS ${patch_stamp})
|
add_custom_target(${patch_name} DEPENDS ${patch_stamp})
|
||||||
add_dependencies(nuttx_patch_${CONFIG} ${patch_name})
|
add_dependencies(nuttx_patch_${CONFIG} ${patch_name})
|
||||||
|
set (last_patch ${patch_name})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
# Read defconfig to see if CONFIG_ARMV7M_STACKCHECK is yes
|
# Read defconfig to see if CONFIG_ARMV7M_STACKCHECK is yes
|
||||||
|
|
Loading…
Reference in New Issue