!14 fix for openeuler 22.03

From: @davidhan008 
Reviewed-by: @anchuanxu 
Signed-off-by: @anchuanxu
This commit is contained in:
openeuler-ci-bot 2022-11-17 11:02:45 +00:00 committed by Gitee
commit 37f4f97b22
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 305 additions and 138 deletions

Binary file not shown.

View File

@ -12,20 +12,139 @@ Software architecture description
nodelet_core
input:
```
nodelet_core/
├── nodelet
│   ├── CHANGELOG.rst
│   ├── CMakeLists.txt
│   ├── include
│   ├── mainpage.dox
│   ├── package.xml
│   ├── scripts
│   ├── src
│   └── srv
├── nodelet_core
│   ├── CHANGELOG.rst
│   ├── CMakeLists.txt
│   └── package.xml
└── nodelet_topic_tools
├── cfg
├── CHANGELOG.rst
├── CMakeLists.txt
├── include
├── mainpage.dox
└── package.xml
```
#### Installation
1. Dowload RPM
1. Download RPM
wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/Mainline/standard_aarch64/aarch64/nodelet_core-1.9.16-0.oe1.aarch64.rpm
aarch64:
2. Install RPM
wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_aarch64/aarch64/ros-noetic-ros-nodelet_core/ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.aarch64.rpm
sudo rpm -ivh nodelet_core-1.9.16-0.oe1.aarch64.rpm
x86_64:
wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_x86_64/x86_64/ros-noetic-ros-nodelet_core/ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.x86_64.rpm
2. Install RPM
aarch64:
sudo rpm -ivh ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.aarch64.rpm --nodeps --force
x86_64:
sudo rpm -ivh ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.x86_64.rpm --nodeps --force
#### Instructions
Exit the nodelet_core file under the /opt/ros/melodic/devel_isolated/ directory , Prove that the software installation is successful
Dependence installation
sh /opt/ros/noetic/install_dependence.sh
Exit the following output file under the /opt/ros/noetic/ directory , Prove that the software installation is successful
```
nodelet
├── cmake.lock
├── env.sh
├── include
│   └── nodelet
│   ├── NodeletList.h
│   ├── NodeletListRequest.h
│   ├── NodeletListResponse.h
│   ├── NodeletLoad.h
│   ├── NodeletLoadRequest.h
│   ├── NodeletLoadResponse.h
│   ├── NodeletUnload.h
│   ├── NodeletUnloadRequest.h
│   └── NodeletUnloadResponse.h
├── lib
│   ├── libnodeletlib.so
│   ├── nodelet
│   │   ├── cmake.lock
│   │   ├── declared_nodelets
│   │   ├── list_nodelets
│   │   └── nodelet
│   ├── pkgconfig
│   │   └── nodelet.pc
│   └── python2.7
│   └── dist-packages
├── local_setup.bash
├── local_setup.sh
├── local_setup.zsh
├── setup.bash
├── setup.sh
├── _setup_util.py
├── setup.zsh
└── share
├── common-lisp
│   └── ros
├── gennodejs
│   └── ros
├── nodelet
│   └── cmake
└── roseus
└── ros
nodelet_core
├── cmake.lock
├── env.sh
├── local_setup.bash
├── local_setup.sh
├── local_setup.zsh
├── setup.bash
├── setup.sh
├── _setup_util.py
└── setup.zsh
nodelet_topic_tools
├── cmake.lock
├── env.sh
├── include
│   └── nodelet_topic_tools
│   └── NodeletThrottleConfig.h
├── lib
│   ├── pkgconfig
│   │   └── nodelet_topic_tools.pc
│   └── python2.7
│   └── dist-packages
├── local_setup.bash
├── local_setup.sh
├── local_setup.zsh
├── setup.bash
├── setup.sh
├── _setup_util.py
├── setup.zsh
└── share
└── nodelet_topic_tools
├── cmake
└── docs
```
#### Contribution

125
README.md
View File

@ -9,22 +9,139 @@ nodelet包现在是nodelet_core的一部分。在以前的版本中它们是
#### 软件架构
软件架构说明
nodelet_core
文件内容:
```
nodelet_core/
├── nodelet
│   ├── CHANGELOG.rst
│   ├── CMakeLists.txt
│   ├── include
│   ├── mainpage.dox
│   ├── package.xml
│   ├── scripts
│   ├── src
│   └── srv
├── nodelet_core
│   ├── CHANGELOG.rst
│   ├── CMakeLists.txt
│   └── package.xml
└── nodelet_topic_tools
├── cfg
├── CHANGELOG.rst
├── CMakeLists.txt
├── include
├── mainpage.dox
└── package.xml
```
#### 安装教程
1.下载rpm包
wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/Mainline/standard_aarch64/aarch64/nodelet_core-1.9.16-0.oe1.aarch64.rpm
aarch64:
wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_aarch64/aarch64/ros-noetic-ros-nodelet_core/ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.aarch64.rpm
x86_64:
wget https://117.78.1.88/build/home:davidhan:branches:openEuler:22.03:LTS/standard_x86_64/x86_64/ros-noetic-ros-nodelet_core/ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.x86_64.rpm
2.安装rpm包
sudo rpm -ivh nodelet_core-1.9.16-0.oe1.aarch64.rpm
aarch64:
sudo rpm -ivh ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.aarch64.rpm --nodeps --force
x86_64:
sudo rpm -ivh ros-noetic-ros-nodelet_core-1.10.1-1.oe2203.x86_64.rpm --nodeps --force
#### 使用说明
安装完成以后,在/opt/ros/melodic/devel_isolated/目录下有nodelet_core/文件夹证明安装成功
依赖环境安装:
sh /opt/ros/noetic/install_dependence.sh
安装完成以后,在/opt/ros/noetic/目录下有如下输出,则表示安装成功
输出:
```
nodelet
├── cmake.lock
├── env.sh
├── include
│   └── nodelet
│   ├── NodeletList.h
│   ├── NodeletListRequest.h
│   ├── NodeletListResponse.h
│   ├── NodeletLoad.h
│   ├── NodeletLoadRequest.h
│   ├── NodeletLoadResponse.h
│   ├── NodeletUnload.h
│   ├── NodeletUnloadRequest.h
│   └── NodeletUnloadResponse.h
├── lib
│   ├── libnodeletlib.so
│   ├── nodelet
│   │   ├── cmake.lock
│   │   ├── declared_nodelets
│   │   ├── list_nodelets
│   │   └── nodelet
│   ├── pkgconfig
│   │   └── nodelet.pc
│   └── python2.7
│   └── dist-packages
├── local_setup.bash
├── local_setup.sh
├── local_setup.zsh
├── setup.bash
├── setup.sh
├── _setup_util.py
├── setup.zsh
└── share
├── common-lisp
│   └── ros
├── gennodejs
│   └── ros
├── nodelet
│   └── cmake
└── roseus
└── ros
nodelet_core
├── cmake.lock
├── env.sh
├── local_setup.bash
├── local_setup.sh
├── local_setup.zsh
├── setup.bash
├── setup.sh
├── _setup_util.py
└── setup.zsh
nodelet_topic_tools
├── cmake.lock
├── env.sh
├── include
│   └── nodelet_topic_tools
│   └── NodeletThrottleConfig.h
├── lib
│   ├── pkgconfig
│   │   └── nodelet_topic_tools.pc
│   └── python2.7
│   └── dist-packages
├── local_setup.bash
├── local_setup.sh
├── local_setup.zsh
├── setup.bash
├── setup.sh
├── _setup_util.py
├── setup.zsh
└── share
└── nodelet_topic_tools
├── cmake
└── docs
```
#### 参与贡献

View File

@ -1,191 +1,117 @@
Name: nodelet_core
Version: 1.9.16
Release: 3
Summary: This is ROS melodic nodelet_core Package
License: GPL
URL: https://github.com/ros-gbp/nodelet_core-release/archive/release/melodic/nodelet_core
Source0: https://github.com/ros-gbp/nodelet_core-release/archive/release/melodic/nodelet_core/1.9.16-0.tar.gz
Name: ros-noetic-ros-nodelet_core
Version: 1.10.1
Release: 1
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
URL: https://github.com/ros-gbp/nodelet_core-release/archive/release/noetic/nodelet_core
Source0: https://github.com/ros-gbp/nodelet_core-release/archive/release/noetic/nodelet_core/1.10.1-1.tar.gz
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: lz4-devel
BuildRequires: bzip2-devel
BuildRequires: python3-devel
BuildRequires: python3-setuptools
#Requires: python-empy
BuildRequires: openssl-devel
#BuildRequires: gcc-gfortran
#BuildRequires: openblas-devel
#BuildRequires: sqlite-devel
#BuildRequires: fftw-devel
BuildRequires: boost-devel
BuildRequires: uuid-devel
BuildRequires: uuid
BuildRequires: libuuid-devel
BuildRequires: python3-unversioned-command
#BuildRequires: uuid-devel
#BuildRequires: python3-devel
#BuildRequires: boost-python3-devel
BuildRequires: libtiff-devel
BuildRequires: libwebp-devel
BuildRequires: libjpeg-turbo-devel
BuildRequires: yaml-cpp-devel
BuildRequires: boost-devel
BuildRequires: libtool-ltdl-devel
BuildRequires: fltk-devel
BuildRequires: libpng-devel
BuildRequires: python3-gpgme
BuildRequires: gpgme-devel
BuildRequires: cpp-gpgme
BuildRequires: python3-crypto
BuildRequires: bullet-devel
BuildRequires: gtest-devel
BuildRequires: gmock-devel
%description
This is ROS melodic ros_comm Package.
This is %{name} Package
%prep
%setup
#cd catkin-0.7.26/
#%build
#pwd
#mkdir build/
#cd build/ && cmake ..
%install
pwd
#mkdir -p build/
#cd build/
#cmake ..
#cd ..
cd src/
cd 3rdparty/
cd empy-3.3.4/
python setup.py install --user
python3 setup.py install --user
cd ..
cd six-1.15.0/
python setup.py install --user
python3 setup.py install --user
cd ..
cd setuptools_scm-4.1.2/
python setup.py install --user
python3 setup.py install --user
cd ..
cd python-dateutil-2.8.1/
python setup.py install --user
python3 setup.py install --user
cd ..
cd pyparsing-2.4.7/
python setup.py install --user
python3 setup.py install --user
cd ..
cd docutils-0.16/
python setup.py install --user
python3 setup.py install --user
cd ..
cd catkin_pkg-0.4.22/
python setup.py install --user
python3 setup.py install --user
cd ..
#for std_msgs
cd PyYAML-5.3.1/
python setup.py install --user
python3 setup.py install --user
cd ..
cd distro-1.5.0/
python setup.py install --user
python3 setup.py install --user
cd ..
cd rospkg-1.2.8/
python setup.py install --user
python3 setup.py install --user
cd ..
cd console_bridge/
mkdir build/
cd build/
cmake ..
make %{?_smp_mflags}
make install
cd ..
cd ..
cd poco/
mkdir cmake-build/
mkdir cmake-release/
cd cmake-build/
cmake ..
make %{?_smp_mflags}
make install
cd ..
cd ..
cd tinyxml2/
mkdir build
cd build
cmake ..
make %{?_smp_mflags}
make install
cd ..
cd ..
cd urdfdom_headers/
mkdir build
cd build
cmake ..
make install
cd ..
cd ..
cd eigen-3.3.7/
mkdir build
cd build
cmake ..
make install
cd ..
cd ..
cd orocos_kdl/
mkdir build
cd build
cmake ..
make %{?_smp_mflags} install
cd ..
cd ..
# 3rdparty
cd ..
cd ..
#compile
./src/catkin/bin/catkin_make_isolated %{?_smp_mflags}
./src/catkin/bin/catkin_make_isolated --install
cp install_dependence.sh install_isolated/
####
# 对install_isoloate内部的变量名称进行替换
#
####
SRC_PATH=$PWD/install_isolated
DST_PATH=/opt/ros/noetic
sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install_isolated/*`
#install
mkdir -p %{buildroot}/opt/ros/melodic/
cp -r devel_isolated/* %{buildroot}/opt/ros/melodic/
echo %{buildroot}
####
# 添加.catkin和.rosinstall文件
#
####
mkdir -p %{buildroot}/opt/ros/noetic/
cp -r install_isolated/* %{buildroot}/opt/ros/noetic/
cp install_isolated/.rosinstall %{buildroot}/opt/ros/noetic/
cp install_isolated/.catkin %{buildroot}/opt/ros/noetic/
%files
#%defattr(-,root,root)
#/opt/ros/melodic/*
/opt/ros/melodic/*
#/usr/lib/share/catkin/cmake/*
%defattr(-,root,root)
/opt/ros/noetic/*
/opt/ros/noetic/.rosinstall
/opt/ros/noetic/.catkin
%changelog
* Tue Apr 27 2021 maminjie <maminjie1@huawei.com> - 1.9.16-3
- Optimize parallel compilation
* Sat Feb 20 2021 zhangjiapeng <zhangjiapeng9@huawei.com> - 1.9.16-2
- Add compilation dependency python3-unversioned-command
* Thu May 28 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.9.16-1
* Tue Dec 15 2020 openEuler Buildteam <hanhaomin008@126.com> - 1.10.1-1
- Package init

5
nodelet_core.yaml Normal file
View File

@ -0,0 +1,5 @@
---
version_control: git
src_repo: https://github.com/ros/nodelet_core.git
tag_prefix: 1.10.1-1
separator: "."