From 059ed588e27fde79f2fc5b2a7d66daceb1f1d922 Mon Sep 17 00:00:00 2001 From: davidhan008 <619409713@qq.com> Date: Thu, 27 May 2021 17:40:53 +0800 Subject: [PATCH 1/3] Fix --- cartographer_ros.spec | 52 ++----------------------------------------- cartographer_ros.yaml | 5 +++++ 2 files changed, 7 insertions(+), 50 deletions(-) create mode 100644 cartographer_ros.yaml diff --git a/cartographer_ros.spec b/cartographer_ros.spec index 2f9b722..863be8f 100644 --- a/cartographer_ros.spec +++ b/cartographer_ros.spec @@ -2,7 +2,7 @@ Name: cartographer_ros Version: 1.0.0 Release: 0 Summary: This is ROS melodic cartographer 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/cartographer-release/archive/release/melodic/cartographer/ Source0: https://github.com/ros-gbp/cartographer-release/archive/release/melodic/cartographer/1.0.0.tar.gz BuildRequires: gcc-c++ @@ -11,22 +11,13 @@ 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,35 +34,17 @@ BuildRequires: assimp-devel BuildRequires: qt5-qtdeclarative-devel BuildRequires: yaml-cpp-devel BuildRequires: libatomic -#BuildRequires: python2-qt5-devel BuildRequires: lz4-devel BuildRequires: sphinx %description -This is ROS melodic ros_comm Package. +This is ROS melodic cartographer_ros 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/ @@ -245,18 +218,6 @@ cd .. cd .. -#cd VTK/ -#mkdir build -#mkdir install -#cp -r ExternalData/ build/ -#cd build -#cmake .. -#make install -#cd .. -#cd .. - - - cd pcl/ mkdir build mkdir install @@ -277,15 +238,6 @@ make install cd .. cd .. - - - - - - - - - # 3rdparty cd .. cd .. diff --git a/cartographer_ros.yaml b/cartographer_ros.yaml new file mode 100644 index 0000000..bb5040e --- /dev/null +++ b/cartographer_ros.yaml @@ -0,0 +1,5 @@ +--- +version_control: git +src_repo: https://github.com/ros/cartographer_ros.git +tag_prefix: 1.0.0 +separator: "." -- Gitee From 2acaac45247bdb6e27576b7510e9a9ac24f28abe Mon Sep 17 00:00:00 2001 From: davidhan008 <619409713@qq.com> Date: Thu, 27 May 2021 17:41:41 +0800 Subject: [PATCH 2/3] fix --- README.en.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.en.md b/README.en.md index 169c562..69d1587 100644 --- a/README.en.md +++ b/README.en.md @@ -18,7 +18,7 @@ W. Hess, D. Kohler, H. Rapp, and D. Andor, Real-Time Loop Closure in 2D LIDAR SL 1. Dowload RPM -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/Mainline/standard_aarch64/aarch64/cartographer_ros-1.0.0-0.oe1.aarch64.rpm +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.03:/LTS/standard_aarch64/aarch64/cartographer_ros-1.0.0-0.oe1.aarch64.rpm 2. Install RPM diff --git a/README.md b/README.md index 55c1bed..ab39fae 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ W. Hess, D. Kohler, H. Rapp, and D. Andor, Real-Time Loop Closure in 2D LIDAR SL 1. 下载rpm包 -wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/Mainline/standard_aarch64/aarch64/cartographer_ros-1.0.0-0.oe1.aarch64.rpm +wget http://121.36.3.168:82/home:/davidhan:/branches:/openEuler:/20.03:/LTS/standard_aarch64/aarch64/cartographer_ros-1.0.0-0.oe1.aarch64.rpm 2. 安装rpm包 -- Gitee From 31ea1cd9e59804cd14063e1409126da4c969b6c5 Mon Sep 17 00:00:00 2001 From: davidhan008 <619409713@qq.com> Date: Tue, 1 Jun 2021 23:06:25 +0800 Subject: [PATCH 3/3] Fix --- cartographer_ros.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cartographer_ros.spec b/cartographer_ros.spec index 863be8f..80695a4 100644 --- a/cartographer_ros.spec +++ b/cartographer_ros.spec @@ -1,6 +1,6 @@ Name: cartographer_ros Version: 1.0.0 -Release: 0 +Release: 1 Summary: This is ROS melodic cartographer 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/cartographer-release/archive/release/melodic/cartographer/ -- Gitee