diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | hil-gps-id-yaw-compat.patch | 17 | ||||
| -rw-r--r-- | mavros-extras.spec (renamed from ros-humble-mavros-extras.spec) | 50 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 13 insertions, 57 deletions
@@ -1 +1,2 @@ /ros-humble-mavros-extras-2.16.0.tar.gz +/mavros-extras-2.4.0.tar.gz diff --git a/hil-gps-id-yaw-compat.patch b/hil-gps-id-yaw-compat.patch deleted file mode 100644 index dc49eec..0000000 --- a/hil-gps-id-yaw-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/mavros_extras/src/plugins/hil.cpp 2026-10-12 10:25:09.627053991 +0000 -+++ b/mavros_extras/src/plugins/hil.cpp 2026-10-12 10:25:09.636054018 +0000 -@@ -240,8 +240,12 @@ - gps.vd = req->vd; - gps.cog = req->cog; - gps.satellites_visible = req->satellites_visible; -- gps.id = req->id; -- gps.yaw = req->yaw; -+ // id and yaw fields were added to HilGPS.msg in mavros 2.16.0; -+ // the ROS SIG repo ships mavros_msgs 2.14.0 which lacks these fields. -+ // Leave gps.id/gps.yaw at default (0) - HIL_GPS still sent, just -+ // without optional id/yaw from the ROS message. -+ // gps.id = req->id; -+ // gps.yaw = req->yaw; - // [[[end]]] (sum: 7jKMh3Vikx) - - uas->send_message(gps); diff --git a/ros-humble-mavros-extras.spec b/mavros-extras.spec index 0c7bfdf..694bc06 100644 --- a/ros-humble-mavros-extras.spec +++ b/mavros-extras.spec @@ -1,18 +1,17 @@ +%define src_version 2.4.0 + # topdir: ros-humble-mavros-extras-2.16.0 (via --transform) %define ros_distro humble %define RosPkgName mavros-extras Name: ros-%{ros_distro}-%{RosPkgName} -Version: 2.16.0 -Release: 5%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: Extra nodes and plugins for MAVROS License: GPLv3 and LGPLv3 and BSD URL: https://github.com/mavlink/mavros -Source0: https://github.com/mavlink/mavros/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz - -# Patch: mavros_msgs 2.14.0 (ROS SIG repo) lacks HilGPS.id/yaw fields added in 2.16.0 -Patch0: hil-gps-id-yaw-compat.patch +Source0: %{RosPkgName}-%{src_version}.tar.gz # debug subpackage not meaningful (/opt prefix, nonstandard strip paths) %global debug_package %{nil} @@ -64,11 +63,8 @@ BuildRequires: ros-%{ros_distro}-yaml-cpp-vendor # --- System (non-ROS) build dependencies --- BuildRequires: eigen3-devel BuildRequires: yaml-cpp-devel -# geographiclib-devel pulls in official geographiclib (provides /usr/bin/GeoConvert -# etc. + FindGeographicLib.cmake + headers); do NOT add separate geographiclib-tools — -# the in-session built geographiclib-tools-2.7.0 ships the same /usr/bin/* and causes -# a file-conflict transaction-test failure. BuildRequires: geographiclib-devel +BuildRequires: geographiclib-tools BuildRequires: python3-click # --- Runtime requires (ROS-specific, autodeps disabled) --- @@ -116,7 +112,7 @@ distance sensor, obstacle distance, terrain, vision pose, etc.) and the terrain tile server. %prep -%autosetup -p1 -n %{name}-%{version} +%autosetup -n %{name}-%{version} %build # The source tarball contains the whole mavros repo (multi-package layout). @@ -128,7 +124,7 @@ cd mavros_extras 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} -# Explicit out-of-source build (openEuler %%cmake macro positional-arg pitfall) +# Explicit out-of-source build (openEuler %cmake macro positional-arg pitfall) mkdir -p .obj && cd .obj cmake .. \ -DCMAKE_INSTALL_PREFIX=/opt/ros/%{ros_distro} \ @@ -148,32 +144,8 @@ cd mavros_extras/.obj /opt/ros/%{ros_distro} %changelog -* Mon Oct 12 2026 AI Importer <ai-importer@openeuler.org> - 2.16.0-5 -- Add -p1 to %%autosetup: Patch0 (hil-gps-id-yaw-compat.patch) uses git-style - a/ and b/ path prefixes. Without -p1, patch looks for the literal - a/mavros_extras/src/plugins/hil.cpp path (which does not exist), causing - "No file to patch. Skipping patch." and aborting %%prep before compilation. - -* Mon Oct 12 2026 AI Importer <ai-importer@openeuler.org> - 2.16.0-4 -- Add Patch0 (hil-gps-id-yaw-compat.patch): comment out gps.id/gps.yaw - assignments in hil.cpp that reference HilGPS fields added in mavros 2.16.0. - The ROS SIG repo ships mavros_msgs 2.14.0 which lacks these fields, causing - "has no member named 'id'/'yaw'" compile errors at hil.cpp:243-244. - The MAVLink HIL_GPS message still has id/yaw (defaults to 0). - -* Mon Oct 12 2026 AI Importer <ai-importer@openeuler.org> - 2.16.0-3 -- Escape %%cmake token in a %%build comment: rpm expands %%macros even - inside comments, so the openEuler %%cmake macro's multi-line body (which - includes %%set_build_flags + a (...) subshell) leaked out of the comment - and was executed as build commands, causing "syntax error near - unexpected token )'" at line 61 of the build script. Replaced with - %%cmake (literal %%cmake) so the comment stays a comment. - -* Mon Oct 12 2026 AI Importer <ai-importer@openeuler.org> - 2.16.0-2 -- Drop BuildRequires: geographiclib-tools: it duplicates /usr/bin/* tools - already provided by official geographiclib (pulled by geographiclib-devel), - causing a dnf transaction-test file conflict. - +* Tue Oct 13 2026 ai-importer <ai-importer@openeuler.org> - 2.4.0-1 +- Rebase to 2.4.0 (ROS batch import) * Mon Oct 12 2026 AI Importer <ai-importer@openeuler.org> - 2.16.0-1 - Initial package for openEuler (ROS 2 humble) -- Built from upstream mavros repo, mavros_extras sub-package +- Built from upstream mavros repo, mavros_extras sub-package
\ No newline at end of file @@ -1 +1 @@ -529dbde82cd5a7d6bc48030e744513c5 ros-humble-mavros-extras-2.16.0.tar.gz +b18d677c04e1912bfa36fecf5636019f mavros-extras-2.4.0.tar.gz |