!38 modify buildrequire crypto to cryptography

From: @zhangxianting Reviewed-by: @anchuanxu Signed-off-by: @anchuanxu
modify buildrequire crypto to cryptography
2024-06-19 03:52:03 +00:00 · 2024-05-29 17:20:05 +08:00 · 2022-11-17 11:02:45 +00:00 · 2022-11-07 02:06:25 +00:00 · 2022-11-03 20:37:24 +08:00 · 2022-11-01 20:54:08 +08:00
5 changed files with 256 additions and 103 deletions
--- a/0001-Use-prebuilt-TinyXML2.patch
+++ b/0001-Use-prebuilt-TinyXML2.patch
@ -1,43 +0,0 @@
-From 3154cd3ca778c151b9a8f8c7af71dcd7f9f55e09 Mon Sep 17 00:00:00 2001
-From: sdlzx <hdu_sdlzx@163.com>
-Date: Sat, 25 Sep 2021 13:44:03 +0800
-Subject: [PATCH] Use prebuilt TinyXML2
-
---
- src/pluginlib/CMakeLists.txt | 4 +---
- src/rospack/CMakeLists.txt   | 4 +---
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/pluginlib/CMakeLists.txt b/src/pluginlib/CMakeLists.txt
-index c19c2f6..3e88204 100644
--- a/src/pluginlib/CMakeLists.txt
-+++ b/src/pluginlib/CMakeLists.txt
-@@ -4,9 +4,7 @@ project(pluginlib)
- find_package(catkin REQUIRED COMPONENTS class_loader rosconsole roslib cmake_modules)
- find_package(Boost REQUIRED COMPONENTS filesystem)
- 
-find_package(TinyXML2 REQUIRED
-PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/install/tinyxml2/
-NO_DEFAULT_PATH)
-+find_package(TinyXML2 REQUIRED)
- 
- catkin_package(
-   INCLUDE_DIRS include
-diff --git a/src/rospack/CMakeLists.txt b/src/rospack/CMakeLists.txt
-index 71e025b..91dc79d 100644
--- a/src/rospack/CMakeLists.txt
-+++ b/src/rospack/CMakeLists.txt
-@@ -5,9 +5,7 @@ find_package(catkin REQUIRED COMPONENTS cmake_modules)
- find_package(Boost REQUIRED COMPONENTS filesystem program_options system)
- set(Python_ADDITIONAL_VERSIONS "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
- find_package(PythonLibs "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" REQUIRED)
-find_package(TinyXML2 REQUIRED
-PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/install/tinyxml2/
-NO_DEFAULT_PATH)
-+find_package(TinyXML2 REQUIRED)
- 
- catkin_package(
-   INCLUDE_DIRS include
-- 
-2.31.1
-
--- a/1.10.1-1.tar.gz
+++ b/1.10.1-1.tar.gz
--- a/README.en.md
+++ b/README.en.md
@ -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:/21.03/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/noetic/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

--- a/README.md
+++ b/README.md
@ -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:/21.03/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/noetic/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
+```
+

 #### 参与贡献

--- a/nodelet_core.spec
+++ b/nodelet_core.spec
@ -1,11 +1,10 @@
-Name:		nodelet_core
+Name:		ros-noetic-ros-nodelet_core
 Version:	1.10.1
 Release:	2
-Summary:	This is ROS noetic nodelet_core Package
+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
-Patch0:		0001-Use-prebuilt-TinyXML2.patch
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
 BuildRequires:	lz4-devel
@ -27,15 +26,16 @@ BuildRequires:  libpng-devel
 BuildRequires:	python3-gpgme
 BuildRequires:	gpgme-devel
 BuildRequires:	cpp-gpgme
-BuildRequires:	python3-crypto
+BuildRequires:	python3-cryptography
 BuildRequires:	bullet-devel
-BuildRequires:	tinyxml2-devel
+BuildRequires:  gtest-devel
+BuildRequires:  gmock-devel

 %description
-This is ROS noetic nodelet_core Package.
+This is %{name} Package

 %prep
-%autosetup -p1
+%setup

 %install

@ -82,49 +82,12 @@ cd rospkg-1.2.8/
 python3 setup.py install --user
 cd ..

-
-
-cd console_bridge/
-mkdir build/
-cd build/
-cmake ..
-make 
-make install
-cd ..
-cd ..
-
-cd poco/
-mkdir cmake-build/
-mkdir cmake-release/
-cd cmake-build/
-cmake ..
-make -j8
-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 ..
-
-
 # 3rdparty
 cd ..

 #compile
 ./src/catkin/bin/catkin_make_isolated --install 
+cp install_dependence.sh install_isolated/

 ####
 # 对install_isoloate内部的变量名称进行替换
@ -139,22 +102,19 @@ sed -i "s:${SRC_PATH}:${DST_PATH}:g"  `grep -rIln "${SRC_PATH}" install_isolated
 #
 ####
 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/noetic/*
 /opt/ros/noetic/.rosinstall
 /opt/ros/noetic/.catkin
-/usr/local/*

 %changelog
-* Sat Sep 25 2021 sdlzx <hdu_sdlzx@163.com> - 1.10.1-2
- Use prebuilt tinyxml2 instead of the bundled one.
+* Wed May 29 2024 zhangxianting <zhangxianting@uniontech.com> - 1.10.1-2
+- modify buildrequire crypto to cryptography

-* Thu 12-15-2020 openEuler Buildteam <hanhaomin008@126.com>
+* Tue Dec 15 2020 openEuler Buildteam <hanhaomin008@126.com> - 1.10.1-1
 - Package init
Author	SHA1	Message	Date
openeuler-ci-bot	0aa3756c0b	!38 modify buildrequire crypto to cryptography From: @zhangxianting Reviewed-by: @anchuanxu Signed-off-by: @anchuanxu	2024-06-19 03:52:03 +00:00
zhangxianting	96c02a1f71	modify buildrequire crypto to cryptography	2024-05-29 17:20:05 +08:00
openeuler-ci-bot	37f4f97b22	!14 fix for openeuler 22.03 From: @davidhan008 Reviewed-by: @anchuanxu Signed-off-by: @anchuanxu	2022-11-17 11:02:45 +00:00
openeuler-ci-bot	eb4fcab716	!13 fix for openeuler 22.03 From: @simonaxi Reviewed-by: @anchuanxu Signed-off-by: @anchuanxu	2022-11-07 02:06:25 +00:00
simonaXi	19ec788114	Fix: fix	2022-11-03 20:37:24 +08:00
simonaXi	0e6e5e3c28	Fix: fix	2022-11-01 20:54:08 +08:00
openeuler-ci-bot	b5cc82af81	!12 【轻量级 PR】：Fix changelog error From: @qiao-yujie Reviewed-by: @anchuanxu Signed-off-by: @anchuanxu	2022-06-16 09:30:46 +00:00
qiaoyujie	e0197c5ad7	Fix changelog error	2022-06-09 02:38:31 +00:00
openeuler-ci-bot	03ed62fd03	!11 fix From: @davidhan008 Reviewed-by: @anchuanxu Signed-off-by: @anchuanxu	2022-02-14 02:42:58 +00:00
davidhan008	7c2f0b1b96	fix	2021-10-18 16:56:42 +08:00