diff options
| -rw-r--r-- | ros2-medkit-linux-introspection.spec | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ros2-medkit-linux-introspection.spec b/ros2-medkit-linux-introspection.spec index 24c72ae..21fe0fe 100644 --- a/ros2-medkit-linux-introspection.spec +++ b/ros2-medkit-linux-introspection.spec @@ -49,12 +49,8 @@ This package provides discovery plugins that expose Linux system information export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages${PYTHONPATH:+:$PYTHONPATH} export PKG_CONFIG_PATH=/opt/ros/%{ros_distro}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH} -# 安装的 ros2_medkit_cmake 包可能缺少部分 cmake 模块；从源码树补装确保完整 -_medkit_cmake_dir=/opt/ros/%{ros_distro}/share/ros2_medkit_cmake/cmake -install -d "${_medkit_cmake_dir}" -for _f in src/ros2_medkit_cmake/cmake/ROS2Medkit*.cmake; do - [ -f "${_medkit_cmake_dir}/$(basename ${_f})" ] || install -m 644 "${_f}" "${_medkit_cmake_dir}/" -done +# 源码树中的 cmake 模块目录，补充已安装包可能缺失的模块（只读，不写系统路径） +_src_cmake_dir=$(pwd)/src/ros2_medkit_cmake/cmake cd src/ros2_medkit_discovery_plugins/ros2_medkit_linux_introspection mkdir -p .obj @@ -63,7 +59,7 @@ cd .obj -DCMAKE_INSTALL_PREFIX="/opt/ros/%{ros_distro}" \ -DAMENT_PREFIX_PATH="/opt/ros/%{ros_distro}" \ -DCMAKE_PREFIX_PATH="/opt/ros/%{ros_distro}" \ - -DCMAKE_MODULE_PATH="${_medkit_cmake_dir}" \ + -DCMAKE_MODULE_PATH="${_src_cmake_dir};/opt/ros/%{ros_distro}/share/ros2_medkit_cmake/cmake" \ -UINCLUDE_INSTALL_DIR -ULIB_INSTALL_DIR -USYSCONF_INSTALL_DIR \ -USHARE_INSTALL_PREFIX -ULIB_SUFFIX \ -DSETUPTOOLS_DEB_LAYOUT=OFF \ @@ -85,5 +81,5 @@ make install DESTDIR=%{buildroot} /opt/ros/%{ros_distro}/ %changelog -* Sat Sep 20 2026 ROS SIG <ros@openeuler.org> - 0.6.0-1 +* Sun Sep 20 2026 ROS SIG <ros@openeuler.org> - 0.6.0-1 - Initial package for ros2_medkit_linux_introspection 0.6.0 |