From 393a33087835f5fee18fa46282d89a430f23a619 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 9 Dec 2025 09:27:11 +0100 Subject: [PATCH 1/3] fix include path (#790) * fix include path (#781) * fix include path * Trigger CI Signed-off-by: Carlosespicur --------- Signed-off-by: Carlosespicur Co-authored-by: Carlosespicur (cherry picked from commit 22cf5e0068cbd2dd28559cc640da614aa5358b6f) * Remove rsync & execute only in non-host scenario Signed-off-by: Eugenio Collado --------- Signed-off-by: Carlosespicur Signed-off-by: Eugenio Collado Co-authored-by: DedSecer Co-authored-by: Carlosespicur Co-authored-by: Eugenio Collado (cherry picked from commit 52d6a34ad0d77b7c586b40f9db94ae3050e21eda) --- scripts/build_firmware.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scripts/build_firmware.sh b/scripts/build_firmware.sh index 96a2c865..e82cc0fe 100755 --- a/scripts/build_firmware.sh +++ b/scripts/build_firmware.sh @@ -76,3 +76,17 @@ else . $PREFIX/config/$RTOS/$PLATFORM/build.sh fi +######## Fix include paths ######## +if [ "$RTOS" != "host" ]; then + cd "$FW_TARGETDIR/mcu_ws" + INCLUDE_ROS2_PACKAGES=$(colcon list | awk '{print $1}' | awk -v d=" " '{s=(NR==1?s:s d)$0}END{print s}') + + for var in ${INCLUDE_ROS2_PACKAGES}; do + if [ -d "$FW_TARGETDIR/build/include/${var}/${var}" ]; then + mkdir -p "$FW_TARGETDIR/build/include/${var}" + cp -a "$FW_TARGETDIR/build/include/${var}/${var}/". "$FW_TARGETDIR/build/include/${var}/" + rm -rf "$FW_TARGETDIR/build/include/${var}/${var}" + fi + done +fi + From b70bebb05303ad00d07b116a24bbfb1563468fbb Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 9 Dec 2025 15:21:51 +0100 Subject: [PATCH 2/3] Compile service_msgs Signed-off-by: Eugenio Collado --- config/host/generic/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/host/generic/build.sh b/config/host/generic/build.sh index 31d497db..f33b8967 100755 --- a/config/host/generic/build.sh +++ b/config/host/generic/build.sh @@ -6,4 +6,10 @@ set +o nounset . install/local_setup.bash set -o nounset +colcon build --packages-up-to service_msgs --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ + +set +o nounset +. install/local_setup.bash +set -o nounset + colcon build --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ From b6974cc72c5a627da00f410575e54cc64f54e00f Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 9 Dec 2025 15:55:09 +0100 Subject: [PATCH 3/3] Compile unique_identifier_msgs Signed-off-by: Eugenio Collado --- config/host/generic/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/host/generic/build.sh b/config/host/generic/build.sh index f33b8967..88fa746c 100755 --- a/config/host/generic/build.sh +++ b/config/host/generic/build.sh @@ -6,7 +6,7 @@ set +o nounset . install/local_setup.bash set -o nounset -colcon build --packages-up-to service_msgs --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ +colcon build --packages-up-to service_msgs unique_identifier_msgs --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ set +o nounset . install/local_setup.bash