diff options
| -rw-r--r-- | plansys2-domain-expert.spec | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/plansys2-domain-expert.spec b/plansys2-domain-expert.spec index 2e87d03..831779a 100644 --- a/plansys2-domain-expert.spec +++ b/plansys2-domain-expert.spec @@ -4,7 +4,7 @@ Name: ros-%{ros_distro}-%{RosPkgName} Version: 2.0.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: This package contains the Domain Expert module for the ROS2 Planning System License: Apache License, Version 2.0 URL: https://github.com/IntelligentRoboticsLabs/ros2_planning_system/tree/humble-devel @@ -77,14 +77,20 @@ make install DESTDIR=%{_builddir}/popf_stage cd ../.. # Build plansys2_domain_expert with popf_plan_solver available from stage +# ament_cmake 在 find_package(ament_cmake) 时会从 AMENT_PREFIX_PATH 重建 +# CMAKE_PREFIX_PATH，但 stage 目录里的 popf_plan_solver ament-index 注册未被 +# 识别，导致 stage 路径被丢弃、find_package(plansys2_popf_plan_solver) 找不到 +# Config 文件。用 <pkg>_DIR cache 变量直接指向 Config 目录绕过该机制（优先级最高）。 export POPF_PREFIX=%{_builddir}/popf_stage/opt/ros/%{ros_distro} export AMENT_PREFIX_PATH="$POPF_PREFIX:/opt/ros/%{ros_distro}" +export plansys2_popf_plan_solver_DIR="$POPF_PREFIX/share/plansys2_popf_plan_solver/cmake" cd plansys2_domain_expert mkdir -p .obj && cd .obj %cmake3 \ -DCMAKE_INSTALL_PREFIX="/opt/ros/%{ros_distro}" \ -DAMENT_PREFIX_PATH="$POPF_PREFIX:/opt/ros/%{ros_distro}" \ -DCMAKE_PREFIX_PATH="$POPF_PREFIX:/opt/ros/%{ros_distro}" \ + -Dplansys2_popf_plan_solver_DIR="$POPF_PREFIX/share/plansys2_popf_plan_solver/cmake" \ -UINCLUDE_INSTALL_DIR -ULIB_INSTALL_DIR -USYSCONF_INSTALL_DIR -USHARE_INSTALL_PREFIX -ULIB_SUFFIX \ -DSETUPTOOLS_DEB_LAYOUT=OFF \ -DBUILD_TESTING=OFF -DTESTING=OFF -DCMAKE_SUPPRESS_REGENERATION=ON \ @@ -108,6 +114,12 @@ make install DESTDIR=%{buildroot} /opt/ros/%{ros_distro} %changelog +* Thu Sep 24 2026 ai-importer <ai-importer@openeuler.org> - 2.0.9-3 +- Pass -Dplansys2_popf_plan_solver_DIR to domain_expert cmake so it + locates the staged popf_plan_solver Config.cmake (ament_cmake rebuilds + CMAKE_PREFIX_PATH from AMENT_PREFIX_PATH at find_package(ament_cmake) + time and drops the build-tree stage prefix) + * Thu Sep 24 2026 ai-importer <ai-importer@openeuler.org> - 2.0.9-2 - Bundle plansys2-popf-plan-solver from the same source tree instead of depending on the broken additional-repo RPM (requires unavailable |