diff options
| -rw-r--r-- | easynav-regulated-pp-controller.spec | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/easynav-regulated-pp-controller.spec b/easynav-regulated-pp-controller.spec index 0d6c80b..ac0d33e 100644 --- a/easynav-regulated-pp-controller.spec +++ b/easynav-regulated-pp-controller.spec @@ -10,7 +10,7 @@ Name: ros-%{ros_distro}-%{RosPkgName} Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Easy Navigation: port of the Nav2 Regulated Pure Pursuit Controller. License: Apache-2.0 URL: https://github.com/EasyNavigation/easynav_plugins @@ -18,10 +18,12 @@ URL: https://github.com/EasyNavigation/easynav_plugins # 源码取自 humble 分支快照（无 0.5.0 tag）。target_version=0.5.0-1 已由 manifest/gate # 给定，Version 取 0.5.0（剥离发布号 -1）；记录实际 commit 以保可追溯。 # commit 为 ros_fetch checkout 后实测的 HEAD（git rev-parse），非占位值。 -# 归档解压根目录：经本地 tar tzf 实测 build/SOURCES/<commit>.tar.gz，解压根目录为 -# 纯完整 commit SHA（703b73ae...），与 spec-rules-ros.md §2 实踩纪律一致。 -# 注：同仓兄弟 spec（easynav-mpc/mppi）误用 -n easynav_plugins-%%{commit}，但 SRPM -# 阶段不跑 %%prep 故未暴露；本包据实测纠正为 -n %%{commit}。 +# 归档解压根目录（spec-rules-ros.md §2 实测纪律，build 113799 实踩纠正）： +# ros_fetch 已将 GitHub archive 重打包，SRPM 内嵌 703b73ae...tar.gz 经 tar tzf +# 实测解压根目录 = easynav-regulated-pp-controller-0.5.0-1（即 +# <RosPkgName>-<version>-<manifest发布号>），非纯 commit SHA。round 1 注释误判为 +# "纯 commit SHA"（幻觉实测）致 -n %%{commit} 与实际根目录不匹配，build 113799 +# %%prep cd 失败。本包据 tar tzf 实测纠正为 -n %%{RosPkgName}-%%{version}-1。 %global commit 703b73ae55bf6a419bf309b26084ca523b063ddf Source0: https://github.com/EasyNavigation/easynav_plugins/archive/%{commit}.tar.gz @@ -93,8 +95,9 @@ ament_cmake shared library registered as a pluginlib plugin easynav_core). %prep -# 解压根目录 = 纯完整 commit SHA（本地 tar tzf 实测 build/SOURCES，spec-rules §2） -%autosetup -n %{commit} +# 解压根目录 = easynav-regulated-pp-controller-0.5.0-1（tar tzf 实测 SRPM 内嵌 +# 703b73ae...tar.gz，ros_fetch 重打包根目录，spec-rules §2 实测纪律；非纯 commit SHA） +%autosetup -n %{RosPkgName}-%{version}-1 %build # ROS 基座环境（spec-rules §4）：setup.sh 用 [ -f ] 守卫，避免无 ROS 依赖 chroot 中止脚本 @@ -125,6 +128,13 @@ make install DESTDIR=%{buildroot} /opt/ros/%{ros_distro} %changelog +* Tue Oct 20 2026 AI Importer <ai-importer@opencode> - 0.5.0-3 +- Fix %prep failure (build 113799): %autosetup -n %{commit} mismatched the + actual tarball root dir. SRPM embeds the ros_fetch-repacked tarball whose + root = easynav-regulated-pp-controller-0.5.0-1 (verified via tar tzf), not + the bare commit SHA a raw GitHub archive would produce. Round 1 comment + wrongly claimed "实测=纯 commit SHA" (hallucinated measurement). Corrected + -n to %{RosPkgName}-%{version}-1 per spec-rules-ros §2 实测纪律. * Tue Oct 20 2026 AI Importer <ai-importer@opencode> - 0.5.0-2 - Fix build failure: escape %%cmake / %%prep / %%files / %%{commit} in spec comments — RPM expands macros in comment lines; the parameterized |