From 3c597837ea53205ff6ad9afb146d62181b715fb1 Mon Sep 17 00:00:00 2001
From: DedSecer <ded5ec@icloud.com>
Date: Tue, 30 Sep 2025 16:23:14 +0800
Subject: [PATCH 1/2] fix include path (#781)

* fix include path

* Trigger CI

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

---------

Signed-off-by: Carlosespicur <carlosespicur@proton.me>
Co-authored-by: Carlosespicur <carlosespicur@proton.me>
(cherry picked from commit 22cf5e0068cbd2dd28559cc640da614aa5358b6f)
---
 scripts/build_firmware.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/build_firmware.sh b/scripts/build_firmware.sh
index 96a2c865..00295688 100755
--- a/scripts/build_firmware.sh
+++ b/scripts/build_firmware.sh
@@ -76,3 +76,14 @@ else
     . $PREFIX/config/$RTOS/$PLATFORM/build.sh
 fi
 
+######## Fix include paths  ########
+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
+        rsync -r $FW_TARGETDIR/build/include/${var}/${var}/* $FW_TARGETDIR/build/include/${var}
+        rm -rf $FW_TARGETDIR/build/include/${var}/${var}
+    fi
+done
+

From 1b649fb2e707caabb23a0010acb0a09c985f9467 Mon Sep 17 00:00:00 2001
From: Eugenio Collado <eugeniocollado@eprosima.com>
Date: Tue, 9 Dec 2025 09:04:34 +0100
Subject: [PATCH 2/2] Remove rsync & execute only in non-host scenario

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
---
 scripts/build_firmware.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/scripts/build_firmware.sh b/scripts/build_firmware.sh
index 00295688..e82cc0fe 100755
--- a/scripts/build_firmware.sh
+++ b/scripts/build_firmware.sh
@@ -77,13 +77,16 @@ else
 fi
 
 ######## Fix include paths  ########
-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}')
+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
-        rsync -r $FW_TARGETDIR/build/include/${var}/${var}/* $FW_TARGETDIR/build/include/${var}
-        rm -rf $FW_TARGETDIR/build/include/${var}/${var}
-    fi
-done
+    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