diff options
| -rw-r--r-- | as2-platform-dji-osdk.spec | 11 | ||||
| -rw-r--r-- | disable-samples.patch | 11 |
2 files changed, 21 insertions, 1 deletions
diff --git a/as2-platform-dji-osdk.spec b/as2-platform-dji-osdk.spec index 80f92b1..7573f8f 100644 --- a/as2-platform-dji-osdk.spec +++ b/as2-platform-dji-osdk.spec @@ -4,7 +4,7 @@ Name: ros-%{ros_distro}-%{RosPkgName} Version: 1.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Package to communicate DJI OSDK with Aerostack2 framework License: BSD-3-Clause URL: https://github.com/aerostack2/as2_platform_dji_osdk/tree/main @@ -12,6 +12,7 @@ Source0: %{RosPkgName}-%{src_version}.tar.gz Source1: Onboard-SDK-master.tar.gz Patch0: ffmpeg5-compat.patch Patch1: gcc12-includes.patch +Patch2: disable-samples.patch %global debug_package %{nil} %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') @@ -59,6 +60,7 @@ tar xzf %{SOURCE1} -C %{_builddir} cd %{_builddir}/Onboard-SDK-master patch -p1 < %{PATCH0} patch -p1 < %{PATCH1} +patch -p1 < %{PATCH2} cd - %build @@ -89,6 +91,13 @@ make install DESTDIR=%{buildroot} /opt/ros/%{ros_distro} %changelog +* Sat Oct 10 2026 ai-importer <ai-importer@openeuler.org> - 1.1.0-5 +- Add disable-samples.patch: comment out add_subdirectory(sample/platform/linux) + in Onboard-SDK top-level CMakeLists.txt +- DJI sample targets (payloads_sync_sample) compile with -O0 -Werror, conflicting + with RPM _FORTIFY_SOURCE=2 flag causing -Werror=cpp build failure; samples are + not needed by the ROS package + * Sat Oct 10 2026 ai-importer <ai-importer@openeuler.org> - 1.1.0-4 - Add gcc12-includes.patch: add #include <string> in mmap_file_buffer.hpp and #include <cstdio> in mmap_file_buffer.cpp diff --git a/disable-samples.patch b/disable-samples.patch new file mode 100644 index 0000000..37efc9a --- /dev/null +++ b/disable-samples.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -67,7 +67,7 @@ + + add_subdirectory(osdk-core) + if (${CMAKE_SYSTEM_NAME} MATCHES Linux) +- add_subdirectory(sample/platform/linux) ++ # add_subdirectory(sample/platform/linux) -- disabled by RPM build, samples not needed + endif() + + #[[ |