diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | as2-platform-crazyflie.spec | 10 | ||||
| -rw-r--r-- | sources | 1 |
3 files changed, 9 insertions, 3 deletions
@@ -1 +1,2 @@ /as2-platform-crazyflie-1.1.0-3.tar.gz +/crazyflie_cpp.tar.gz diff --git a/as2-platform-crazyflie.spec b/as2-platform-crazyflie.spec index 5b884ec..f3dfe9b 100644 --- a/as2-platform-crazyflie.spec +++ b/as2-platform-crazyflie.spec @@ -9,6 +9,7 @@ Summary: Package to communicate Crazyflie drones with Aerostack2 framewor License: BSD-3-Clause URL: https://github.com/aerostack2/as2_platform_crazyflie/tree/main Source0: %{RosPkgName}-%{src_version}.tar.gz +Source1: crazyflie_cpp.tar.gz %global debug_package %{nil} %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') @@ -28,7 +29,7 @@ BuildRequires: ros-%{ros_distro}-std-srvs BuildRequires: ros-%{ros_distro}-as2-core BuildRequires: ros-%{ros_distro}-as2-msgs BuildRequires: eigen3-devel -BuildRequires: libusb-1.0 +BuildRequires: libusbx-devel Requires: ros-%{ros_distro}-ros-workspace Requires: ros-%{ros_distro}-ament-cmake @@ -42,7 +43,7 @@ Requires: ros-%{ros_distro}-std-srvs Requires: ros-%{ros_distro}-as2-core Requires: ros-%{ros_distro}-as2-msgs Requires: eigen3-devel -Requires: libusb-1.0 +Requires: libusbx Provides: %{name}-devel = %{version}-%{release} Provides: %{name}-doc = %{version}-%{release} @@ -53,6 +54,7 @@ Package to communicate Crazyflie drones with Aerostack2 framework %prep %autosetup -n %{RosPkgName}-%{src_version} +tar xzf %{SOURCE1} -C %{_builddir} %build [ -f /opt/ros/%{ros_distro}/setup.sh ] && source /opt/ros/%{ros_distro}/setup.sh || true @@ -66,6 +68,7 @@ mkdir -p .obj && cd .obj -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 \ + -DFETCHCONTENT_SOURCE_DIR_CRAZYFLIE_CPP=%{_builddir}/crazyflie_cpp-master \ .. make %{?_smp_mflags} @@ -81,4 +84,5 @@ make install DESTDIR=%{buildroot} %changelog * Sat Oct 10 2026 ai-importer <ai-importer@openeuler.org> - 1.1.0-1 -- Initial import (ROS batch) +- Vendor crazyflie_cpp source (Source1) to fix offline FetchContent failure +- Switch libusb to libusbx-devel (openEuler native, provides headers) @@ -1 +1,2 @@ 2ee26e6eb08c39ac222e23c5844974f5 as2-platform-crazyflie-1.1.0-3.tar.gz +6cb76034909a698ca5af077f7993aee2 crazyflie_cpp.tar.gz |