From e24dfed805d0959eaee6e2c07a0f67058defbc0b Mon Sep 17 00:00:00 2001 From: davidhan008 <619409713@qq.com> Date: Tue, 22 Aug 2023 18:33:59 +0800 Subject: [PATCH] fix --- ros2_base.spec | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/ros2_base.spec b/ros2_base.spec index 0c989de..01ed057 100644 --- a/ros2_base.spec +++ b/ros2_base.spec @@ -161,19 +161,19 @@ cd .. cd .. # for colcon build tools -cd build_tools -export BUILD_WORSPCE=$PWD -./colcon/colcon-core/bin/colcon build --paths colcon/* --merge-install -source install/local_setup.sh -cd .. +#cd build_tools +#export BUILD_WORSPCE=$PWD +#./colcon/colcon-core/bin/colcon build --paths colcon/* --merge-install +#source install/local_setup.sh +#cd .. # for workspace -cd workspace -colcon build --merge-install -cp ../install_dependence.sh install/ -cp -r ../build_tools/install/bin install/ -cp -r ../build_tools/install/lib install/ -cp -r ../build_tools/install/share install/ +#cd workspace +#colcon build --merge-install +#cp ../install_dependence.sh install/ +#cp -r ../build_tools/install/bin install/ +#cp -r ../build_tools/install/lib install/ +#cp -r ../build_tools/install/share install/ #### # for unit test 循环拷贝所有的东西 @@ -184,20 +184,20 @@ cp -r ../build_tools/install/share install/ # 对install内部的变量名称进行替换 # #### -SRC_PATH=$PWD/install -DST_PATH=/opt/ros/foxy -sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install/*` +#SRC_PATH=$PWD/install +#DST_PATH=/opt/ros/foxy +#sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install/*` -SRC_PATH=$BUILD_WORSPCE/install -DST_PATH=/opt/ros/foxy -sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install/*` +#SRC_PATH=$BUILD_WORSPCE/install +#DST_PATH=/opt/ros/foxy +#sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install/*` #### # install # #### -mkdir -p %{buildroot}/opt/ros/foxy/ -cp -r install/* %{buildroot}/opt/ros/foxy/ +#mkdir -p %{buildroot}/opt/ros/foxy/ +#cp -r install/* %{buildroot}/opt/ros/foxy/ ###for debug #mkdir -p %{buildroot}/opt/ros/foxy/log @@ -205,7 +205,6 @@ cp -r install/* %{buildroot}/opt/ros/foxy/ %files %defattr(-,root,root) -/opt/ros/foxy/* %changelog * Sat Nov 19 2022 openEuler Buildteam - 0.9.2-2 -- Gitee