diff --git a/0.7.26-1.tar.gz b/0.8.10-1.tar.gz similarity index 33% rename from 0.7.26-1.tar.gz rename to 0.8.10-1.tar.gz index fa241441f66d566b3cc7ae476fc0d9c0bd7a4faa..c28efab1df8d397d33a8c2a33d8190dbb4b78dfc 100644 Binary files a/0.7.26-1.tar.gz and b/0.8.10-1.tar.gz differ diff --git a/README.en.md b/README.en.md index 2477561ffd5aa2396bdd69134fa8e834219c3df0..8ad7d0f6b1b9b9ca1b8f27b476d139ba1085fda7 100644 --- a/README.en.md +++ b/README.en.md @@ -13,16 +13,16 @@ catkin includes catkin_make,caktin_make,catkin_make_isolated,catkin_package_vers 1. Dowload RPM -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.09/standard_aarch64/aarch64/catkin-0.7.26-1.oe1.aarch64.rpm +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/catkin-0.8.10-1.oe1.aarch64.rpm 2. Install RPM -sudo rpm -ivh catkin-0.7.26-1.oe1.aarch64.rpm +sudo rpm -ivh catkin-0.8.10-1.oe1.aarch64.rpm #### Instructions -Exit the catkin file under the /opt/ros/melodic/devel_isolated/ directory , Prove that the software installation is successful +Exit the catkin file under the /opt/ros/melodic/ directory , Prove that the software installation is successful #### Contribution diff --git a/README.md b/README.md index c2e5e6f4db599e7fe79ecf2af917f7d28e142396..7e10f06a7530c68ca984e8f2ac8fcd04746b59f9 100644 --- a/README.md +++ b/README.md @@ -13,16 +13,16 @@ catkin 包含catkin_make,caktin_make,catkin_make_isolated,catkin_package_version 1. 下载rpm包 - wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.09/standard_aarch64/aarch64/catkin-0.7.26-1.oe1.aarch64.rpm + wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/21.03/standard_aarch64/aarch64/catkin-0.8.10-1.oe1.aarch64.rpm 2. 安装rpm包 - sudo rpm -ivh catkin-0.7.26-1.oe1.aarch64.rpm + sudo rpm -ivh catkin-0.8.10-1.oe1.aarch64.rpm #### 使用说明 -安装完成以后，在/opt/ros/melodic/devel_isolated/目录下有catkin/文件夹证明安装成功 +安装完成以后，在/opt/ros/melodic/目录下有catkin/文件夹证明安装成功 #### 参与贡献 diff --git a/catkin.spec b/catkin.spec index 1fd5f40e5bad0796ca2c0e6cede4700a8464e115..99d1e7786cbad3a0c15b0878010faf39c2f30f5b 100644 --- a/catkin.spec +++ b/catkin.spec @@ -1,125 +1,80 @@ Name: catkin -Version: 0.7.26 +Version: 0.8.10 Release: 1 -Summary: This is ROS melodic Catkin Package -License: GPL -URL: https://github.com/ros-gbp/catkin-release/archive/release/melodic/catkin -Source0: https://github.com/ros-gbp/catkin-release/archive/release/melodic/catkin/0.7.26-1.tar.gz +Summary: This is ROS noetic Catkin Package +License: Public Domain and Apache-2.0 and BSD and MIT and BSL-1.0 +URL: https://github.com/ros-gbp/catkin-release/archive/release/noetic/catkin +Source0: https://github.com/ros-gbp/catkin-release/archive/release/noetic/catkin/0.8.10-1.tar.gz BuildRequires: gcc-c++ BuildRequires: cmake -BuildRequires: python-devel -BuildRequires: python-setuptools -#BuildRequires: libjpeg-turbo-devel -#BuildRequires: gcc-gfortran -#BuildRequires: openblas-devel -#BuildRequires: sqlite-devel -#BuildRequires: fftw-devel -#BuildRequires: boost-devel -#BuildRequires: python3-devel -#BuildRequires: boost-python3-devel +BuildRequires: python3-devel +BuildRequires: python3-setuptools %description -This is ROS melodic Catkin Package include catkin_make, catkin_init_workspace, and so on. +This is ROS noetic catkin Package. %prep %setup -#cd catkin-0.7.26/ - - - - -#%build - -#pwd -#mkdir build/ -#cd build/ && cmake .. - - %install -pwd -cd src/ -#pwd : catkin/src/ - cd 3rdparty/ -#pwd : catkin/src/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 .. cd .. -#pwd : catkin/src/ -cd .. -#pwd : catkin/ - -#compile -./src/catkin/bin/catkin_make_isolated - - -#mkdir -p build/ -#cd build/ -#cmake .. -#cd .. - -mkdir -p %{buildroot}/usr/bin/ - - -install -m 777 src/catkin/bin/catkin_make %{buildroot}/usr/bin/catkin_make -install -m 777 src/catkin/bin/catkin_init_workspace %{buildroot}/usr/bin/catkin_init_workspace -install -m 777 src/catkin/bin/catkin_find %{buildroot}/usr/bin/catkin_find -install -m 777 src/catkin/bin/catkin_make_isolated %{buildroot}/usr/bin/catkin_make_isolated -install -m 777 src/catkin/bin/catkin_test_results %{buildroot}/usr/bin/catkin_test_results -install -m 777 src/catkin/bin/catkin_topological_order %{buildroot}/usr/bin/catkin_topological_order -#mkdir -p %{buildroot}/usr/lib/share/catkin/cmake/ - -#cp -r cmake/ %{buildroot}/usr/lib/share/catkin/ -#install -m 777 cmake/templates/setup.bash.in %{buildroot}/opt/ros/melodic/setup.bash -#install -m 777 cmake/templates/env.sh.in %{buildroot}/opt/ros/melodic/env.sh - -mkdir -p %{buildroot}/opt/ros/melodic/ -cp -r devel_isolated/* %{buildroot}/opt/ros/melodic/ - - -#mkdir -p %{buildroot}/opt/ros/melodic/share/catkin/cmake/ -#cp -r cmake/ %{buildroot}/opt/ros/melodic/share/catkin/ - - -echo %{buildroot} +./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/*` + +#### +# 添加.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/ %files -#%defattr(-,root,root) -/opt/ros/melodic/* -/usr/bin/* - - +%defattr(-,root,root) +/opt/ros/noetic/* +/opt/ros/noetic/.rosinstall +/opt/ros/noetic/.catkin %changelog -* Thu May 28 2020 openEuler Buildteam - 19.4-1 +* Thu 12-15-2020 openEuler Buildteam - Package init - diff --git a/catkin.yaml b/catkin.yaml new file mode 100644 index 0000000000000000000000000000000000000000..9e4baed66fe39e41917a7b5f9b63f993aaa0dd6a --- /dev/null +++ b/catkin.yaml @@ -0,0 +1,5 @@ +--- +version_control: git +src_repo: https://github.com/ros/catkin.git +tag_prefix: 0.8.10-1 +separator: "."