Fix path error

ForteFibre · Oct 26, 2023 · 4ef88f7 · 4ef88f7
1 parent 64872af
commit 4ef88f7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 67 deletions.
diff --git a/docker/scripts/cross_compile.sh b/docker/scripts/cross_compile.sh
@@ -10,7 +10,9 @@ export SYSROOT=/root/rootfs
 export PYTHON_LIBRARY="${SYSROOT}/usr/lib/aarch64-linux-gnu/libpython3.10.so"
 export PYTHON_INCLUDE_DIR="${SYSROOT}/usr/include/python3.10"
 
-source /root/ros2/install/setup.bash
+if [ -f /root/ros2/install/setup.bash ]; then
+    source /root/ros2/install/setup.bash
+fi
 
 colcon \
     build \
@@ -26,4 +28,6 @@ colcon \
     -DPYTHON_INCLUDE_DIR=$PYTHON_INCLUDE_DIR \
     "$@"
 
-chown -R $UID:$GID /root/ros2
+if [ -d /root/ros2_ws ]; then
+    chown -R $UID:$GID /root/ros2_ws
+fi
diff --git a/ros2_cross_compile b/ros2_cross_compile
diff --git a/scripts/release/alias_setup.sh b/scripts/release/alias_setup.sh
@@ -40,7 +40,8 @@ setup_colcon_cross() {
       ros2_arm64_cross "$@"
 
     echo "Rewriting path of packages"
-    find $PWD/install/share/ament_index/resource_index/parent_prefix_path -type f -exec sed -i s%/root/ros2%$PWD% {} ";"
+    find $PWD/install/share/ament_index/resource_index/parent_prefix_path -type f -exec sed -i s%/root/ros2_ws%$PWD% {} ";"
+    find $PWD/install/share/ament_index/resource_index/parent_prefix_path -type f -exec sed -i s%/root/ros2/install%/opt/ros/$ROS_DISTRO% {} ";"
   }
 
   export -f colcon_cross_build

diff --git a/scripts/release/build_ros2.sh b/scripts/release/build_ros2.sh
diff --git a/scripts/system/build_ros2_base.sh b/scripts/system/build_ros2_base.sh
@@ -23,8 +23,8 @@ fi
 echo "Building ROS system..."
 docker run --rm $TTY_OPTS \
   --volume $PWD/ros2_sysroot:/root/rootfs \
-  --volume $PWD/ros2_humble:/root/ros2_ws \
-  -w /root/ros2_ws \
+  --volume $PWD/ros2_humble:/root/ros2 \
+  -w /root/ros2 \
   --entrypoint /bin/bash \
   --env UID=`id -u` \
   --env GID=`id -g` \