diff options
| -rw-r--r-- | ros2-medkit-linux-introspection.spec | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/ros2-medkit-linux-introspection.spec b/ros2-medkit-linux-introspection.spec index b263679..21fe0fe 100644 --- a/ros2-medkit-linux-introspection.spec +++ b/ros2-medkit-linux-introspection.spec @@ -42,20 +42,15 @@ This package provides discovery plugins that expose Linux system information (procfs, systemd services, container metadata) through the ros2_medkit gateway interface. %prep -%setup -q -n ros2_medkit-%{commit} +%setup -q -n ros2-medkit-linux-introspection-0.6.0-1 %build [ -f /opt/ros/%{ros_distro}/setup.sh ] && source /opt/ros/%{ros_distro}/setup.sh || true 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 包可能缺少 ROS2MedkitCoverage 等 cmake 模块文件； -# 从源码树直接补装，确保 CMAKE_MODULE_PATH 能找到它们。 -_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 @@ -64,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 \ @@ -86,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 |