diff --git a/1.9.16-0.tar.gz b/1.10.1-1.tar.gz similarity index 70% rename from 1.9.16-0.tar.gz rename to 1.10.1-1.tar.gz index 9fcc04e..bb1e1af 100644 Binary files a/1.9.16-0.tar.gz and b/1.10.1-1.tar.gz differ diff --git a/README.en.md b/README.en.md index 9ae181d..e31f342 100644 --- a/README.en.md +++ b/README.en.md @@ -17,7 +17,7 @@ nodelet_core 1. Dowload 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 +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/nodelet_core-1.9.16-0.oe1.aarch64.rpm 2. Install RPM @@ -25,7 +25,7 @@ sudo rpm -ivh nodelet_core-1.9.16-0.oe1.aarch64.rpm #### Instructions -Exit the nodelet_core file under the /opt/ros/melodic/devel_isolated/ directory , Prove that the software installation is successful +Exit the nodelet_core file under the /opt/ros/noetic/devel_isolated/ directory , Prove that the software installation is successful #### Contribution diff --git a/README.md b/README.md index 9148515..304114d 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ nodelet_core 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 +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/nodelet_core-1.9.16-0.oe1.aarch64.rpm 2.安装rpm包 @@ -24,7 +24,7 @@ sudo rpm -ivh nodelet_core-1.9.16-0.oe1.aarch64.rpm #### 使用说明 -安装完成以后，在/opt/ros/melodic/devel_isolated/目录下有nodelet_core/文件夹证明安装成功 +安装完成以后，在/opt/ros/noetic/devel_isolated/目录下有nodelet_core/文件夹证明安装成功 #### 参与贡献 diff --git a/nodelet_core.spec b/nodelet_core.spec index 73866c4..7a8678f 100644 --- a/nodelet_core.spec +++ b/nodelet_core.spec @@ -1,99 +1,83 @@ 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 +Version: 1.10.1 +Release: 1 +Summary: This is ROS noetic nodelet_core 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 %description -This is ROS melodic ros_comm Package. +This is ROS noetic nodelet_core 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 .. @@ -102,7 +86,7 @@ cd console_bridge/ mkdir build/ cd build/ cmake .. -make %{?_smp_mflags} +make make install cd .. cd .. @@ -112,7 +96,7 @@ mkdir cmake-build/ mkdir cmake-release/ cd cmake-build/ cmake .. -make %{?_smp_mflags} +make -j8 make install cd .. cd .. @@ -122,7 +106,7 @@ cd tinyxml2/ mkdir build cd build cmake .. -make %{?_smp_mflags} +make -j5 make install cd .. cd .. @@ -144,48 +128,39 @@ 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 +#### +# 对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/ +mkdir -p %{buildroot}/usr/local/ +cp -r install_isolated/* %{buildroot}/opt/ros/noetic/ +cp install_isolated/.rosinstall %{buildroot}/opt/ros/noetic/ +cp install_isolated/.catkin %{buildroot}/opt/ros/noetic/ +cp -r 3rdparty/install/* %{buildroot}/usr/local/ %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 +/usr/local/* %changelog -* Tue Apr 27 2021 maminjie - 1.9.16-3 -- Optimize parallel compilation - -* Sat Feb 20 2021 zhangjiapeng - 1.9.16-2 -- Add compilation dependency python3-unversioned-command - -* Thu May 28 2020 openEuler Buildteam - 1.9.16-1 +* Thu 12-15-2020 openEuler Buildteam - Package init diff --git a/nodelet_core.yaml b/nodelet_core.yaml new file mode 100644 index 0000000..d5e68cc --- /dev/null +++ b/nodelet_core.yaml @@ -0,0 +1,5 @@ +--- +version_control: git +src_repo: https://github.com/ros/nodelet_core.git +tag_prefix: 1.10.1-1 +separator: "."