Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
e9ed3465c6
!34 point source path at prep
From: @zhangxianting 
Reviewed-by: @davidhan008 
Signed-off-by: @davidhan008
2024-04-10 06:42:07 +00:00
zhangxianting
6866a7f2c1 point source path at prep 2024-04-09 15:57:48 +08:00
openeuler-ci-bot
1ed175aa30
!33 回退nodelet_core的版本-24.03-lts分支
From: @simonaxi 
Reviewed-by: @davidhan008 
Signed-off-by: @davidhan008
2024-03-25 02:22:07 +00:00
simonaXi
ba44fe56ab Fix: revert nodelet core 2024-03-20 17:55:55 +08:00
openeuler-ci-bot
e7a15c176a
!30 Init: ros noetic package
From: @simonaxi 
Reviewed-by: @davidhan008 
Signed-off-by: @davidhan008
2024-02-26 02:07:20 +00:00
simonaXi
bf4f44b781 Init: ros noetic for nodelet_core 2024-01-22 11:32:06 +08:00
openeuler-ci-bot
a5bd978806
!27 修复maser问题
From: @davidhan008 
Reviewed-by: @anchuanxu 
Signed-off-by: @anchuanxu
2023-08-26 07:02:58 +00:00
davidhan008
a1d3f12149
update nodelet_core.spec.
Signed-off-by: davidhan008 <619409713@qq.com>
2023-08-26 06:59:24 +00:00
openeuler-ci-bot
74f62f8d12
!22 修复poco重复提供动态链接库
From: @davidhan008 
Reviewed-by: @anchuanxu 
Signed-off-by: @anchuanxu
2023-08-22 11:20:02 +00:00
davidhan008
bc05376238 Fix: fix empty 2023-06-27 10:05:12 +08:00

View File

@ -1,6 +1,6 @@
Name: ros-noetic-ros-nodelet_core Name: nodelet_core
Version: 1.10.1 Version: 1.10.1
Release: 1 Release: 2
Summary: This is ROS noetic %{name} Package Summary: This is ROS noetic %{name} Package
License: Public Domain and Apache-2.0 and BSD and MIT and BSL-1.0 and LGPL-2.1-only and MPL-2.0 and GPL-3.0-only and GPL-2.0-or-later and MPL-1.1 and IJG and Zlib and OFL-1.1 License: Public Domain and Apache-2.0 and BSD and MIT and BSL-1.0 and LGPL-2.1-only and MPL-2.0 and GPL-3.0-only and GPL-2.0-or-later and MPL-1.1 and IJG and Zlib and OFL-1.1
URL: https://github.com/ros-gbp/nodelet_core-release/archive/release/noetic/nodelet_core URL: https://github.com/ros-gbp/nodelet_core-release/archive/release/noetic/nodelet_core
@ -23,10 +23,6 @@ BuildRequires: boost-devel
BuildRequires: libtool-ltdl-devel BuildRequires: libtool-ltdl-devel
BuildRequires: fltk-devel BuildRequires: fltk-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: python3-gpgme
BuildRequires: gpgme-devel
BuildRequires: cpp-gpgme
BuildRequires: python3-crypto
BuildRequires: bullet-devel BuildRequires: bullet-devel
BuildRequires: gtest-devel BuildRequires: gtest-devel
BuildRequires: gmock-devel BuildRequires: gmock-devel
@ -35,7 +31,7 @@ BuildRequires: gmock-devel
This is %{name} Package This is %{name} Package
%prep %prep
%setup %setup -q -n ros-noetic-ros-%{name}-%{version}
%install %install
@ -86,32 +82,32 @@ cd ..
cd .. cd ..
#compile #compile
./src/catkin/bin/catkin_make_isolated --install #./src/catkin/bin/catkin_make_isolated --install
cp install_dependence.sh install_isolated/ #cp install_dependence.sh install_isolated/
#### ####
# 对install_isoloate内部的变量名称进行替换 # 对install_isoloate内部的变量名称进行替换
# #
#### ####
SRC_PATH=$PWD/install_isolated #SRC_PATH=$PWD/install_isolated
DST_PATH=/opt/ros/noetic #DST_PATH=/opt/ros/noetic
sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install_isolated/*` #sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install_isolated/*`
#### ####
# 添加.catkin和.rosinstall文件 # 添加.catkin和.rosinstall文件
# #
#### ####
mkdir -p %{buildroot}/opt/ros/noetic/ #mkdir -p %{buildroot}/opt/ros/noetic/
cp -r install_isolated/* %{buildroot}/opt/ros/noetic/ #cp -r install_isolated/* %{buildroot}/opt/ros/noetic/
cp install_isolated/.rosinstall %{buildroot}/opt/ros/noetic/ #cp install_isolated/.rosinstall %{buildroot}/opt/ros/noetic/
cp install_isolated/.catkin %{buildroot}/opt/ros/noetic/ #cp install_isolated/.catkin %{buildroot}/opt/ros/noetic/
%files %files
%defattr(-,root,root) %defattr(-,root,root)
/opt/ros/noetic/*
/opt/ros/noetic/.rosinstall
/opt/ros/noetic/.catkin
%changelog %changelog
* Tue Apr 09 2024 zhangxianting <zhangxianting@uniontech.com> - 1.10.1-2
- point source patch at prep
* Tue Dec 15 2020 openEuler Buildteam <hanhaomin008@126.com> - 1.10.1-1 * Tue Dec 15 2020 openEuler Buildteam <hanhaomin008@126.com> - 1.10.1-1
- Package init - Package init