From 562e9a76657c93bad219cd99c833f3613337697a Mon Sep 17 00:00:00 2001 From: davidhan008 <619409713@qq.com> Date: Sun, 23 May 2021 21:54:15 +0800 Subject: [PATCH 1/2] Fix: fix --- README.en.md | 2 +- README.md | 2 +- orocos_kdl.spec | 46 +++++++++++++++++++++++++--------------------- orocos_kdl.yaml | 5 +++++ 4 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 orocos_kdl.yaml diff --git a/README.en.md b/README.en.md index 51e3edf..35952d5 100644 --- a/README.en.md +++ b/README.en.md @@ -12,7 +12,7 @@ representations for kinematic structures and their inverse and forward kinematic #### Installation 1. Dowload RPM -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.09/standard_aarch64/aarch64//orocos_kdl-1.4.0-0.oe1.aarch64.rpm +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.03:/LTS/standard_aarch64/aarch64//orocos_kdl-1.4.0-0.oe1.aarch64.rpm 2. Install RPM diff --git a/README.md b/README.md index 8be118d..2e8b81f 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Orocos项目提供实时可用的运动学和动力学代码，它包含刚体 1. 下载rpm包 -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.09/standard_aarch64/aarch64/orocos_kdl-1.4.0-0.oe1.aarch64.rpm +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.03:/LTS/standard_aarch64/aarch64/orocos_kdl-1.4.0-0.oe1.aarch64.rpm 2. 安装rpm包 diff --git a/orocos_kdl.spec b/orocos_kdl.spec index 4804c7c..a775454 100644 --- a/orocos_kdl.spec +++ b/orocos_kdl.spec @@ -2,7 +2,7 @@ Name: orocos_kdl Version: 1.4.0 Release: 0 Summary: This is orocos_kdl Package -License: GPL +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/orocos_kdl-release/archive/release/melodic/orocos_kdl Source0: https://github.com/ros-gbp/orocos_kdl-release/archive/release/melodic/orocos_kdl/1.4.0.tar.gz BuildRequires: gcc-c++ @@ -11,22 +11,7 @@ BuildRequires: lz4-devel BuildRequires: bzip2-devel BuildRequires: python-devel BuildRequires: python-setuptools -#Requires: python-empy -#BuildRequires: openssl-devel -#BuildRequires: curl-devel -#BuildRequires: curl -#BuildRequires: gcc-gfortran -#BuildRequires: openblas-devel -#BuildRequires: sqlite-devel -#BuildRequires: fftw-devel BuildRequires: boost-devel -#BuildRequires: uuid-devel -#BuildRequires: uuid -#BuildRequires: libuuid-devel -#BuildRequires: uuid-devel -#BuildRequires: python3-devel -#BuildRequires: boost-python3-devel - BuildRequires: gmock-devel BuildRequires: suitesparse-devel BuildRequires: lua-devel @@ -43,7 +28,6 @@ BuildRequires: assimp-devel BuildRequires: qt5-qtdeclarative-devel BuildRequires: yaml-cpp-devel BuildRequires: libatomic -#BuildRequires: python2-qt5-devel BuildRequires: lz4-devel BuildRequires: sphinx @@ -53,8 +37,8 @@ This is orocos_kdl Package. %prep %setup - %install + cd 3rdparty/ cd empy-3.3.4/ @@ -85,6 +69,7 @@ cd catkin_pkg-0.4.22/ python setup.py install --user cd .. +#for std_msgs cd PyYAML-5.3.1/ python setup.py install --user cd .. @@ -105,22 +90,41 @@ make install cd .. cd .. -cd .. -./src/catkin/bin/catkin_make_isolated --install +# 3rdparty +cd .. + +#compile +./src/catkin/bin/catkin_make_isolated --install + +#### +# 对install_isoloate内部的变量名称进行替换 +# +#### +SRC_PATH=$PWD/install_isolated +DST_PATH=/opt/ros/melodic +sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install_isolated/*` + +#### +# 添加.catkin和.rosinstall文件 +# +#### mkdir -p %{buildroot}/opt/ros/melodic/ mkdir -p %{buildroot}/usr/local/ cp -r install_isolated/* %{buildroot}/opt/ros/melodic/ +cp install_isolated/.rosinstall %{buildroot}/opt/ros/melodic/ +cp install_isolated/.catkin %{buildroot}/opt/ros/melodic/ cp -r 3rdparty/install/* %{buildroot}/usr/local/ %files %defattr(-,root,root) /opt/ros/melodic/* +/opt/ros/melodic/.rosinstall +/opt/ros/melodic/.catkin /usr/local/* %changelog * Thu 12-15-2020 openEuler Buildteam - Package init - diff --git a/orocos_kdl.yaml b/orocos_kdl.yaml new file mode 100644 index 0000000..f0582a1 --- /dev/null +++ b/orocos_kdl.yaml @@ -0,0 +1,5 @@ +--- +version_control: git +src_repo: https://github.com/ros/orocos_kdl.git +tag_prefix: 1.4.0 +separator: "." -- Gitee From 9ee79c0bc0c4156bfc4588aee4b53a429026021a Mon Sep 17 00:00:00 2001 From: davidhan008 <619409713@qq.com> Date: Mon, 24 May 2021 09:49:17 +0800 Subject: [PATCH 2/2] Fix --- orocos_kdl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orocos_kdl.spec b/orocos_kdl.spec index a775454..0a01e2e 100644 --- a/orocos_kdl.spec +++ b/orocos_kdl.spec @@ -1,6 +1,6 @@ Name: orocos_kdl Version: 1.4.0 -Release: 0 +Release: 1 Summary: This is orocos_kdl 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/orocos_kdl-release/archive/release/melodic/orocos_kdl -- Gitee