From 22c336ac9d5fd59cdcb42793b461382556a4b98b Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Wed, 30 Sep 2026 06:54:56 +0000 Subject: automatic import of ros-humble-fss-bringup --- fss-bringup.spec | 9 ++++----- sources | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/fss-bringup.spec b/fss-bringup.spec index 5420dcc..2ec064e 100644 --- a/fss-bringup.spec +++ b/fss-bringup.spec @@ -56,24 +56,23 @@ the ROS 2 %{ros_distro} distribution and installed under /opt/ros/%{ros_distro}. %build # ROS 基座环境(chroot 已配置 ROS SIG repo;无 ROS 依赖的包 buildroot 里 # 可能没有 setup.sh,必须用 [ -f ] 守卫——直接 source 不存在的文件在 -# 严格 sh 下会中止整个 %build 脚本,|| true 挡不住) +# 严格 sh 下会中止整个 %%build 脚本,|| true 挡不住) [ -f /opt/ros/%{ros_distro}/setup.sh ] && source /opt/ros/%{ros_distro}/setup.sh || true 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} # 包位于 monorepo 子目录 src/fss_bringup;显式 out-of-source 构建 -# (避免 spec 顶层直接 %cmake 的位置参数坑——openEuler %cmake 宏带位置 +# (避免 spec 顶层直接 %%cmake 的位置参数坑——openEuler %%cmake 宏带位置 # 参数时会错误解析源码目录,build 444 实踩) cd src/fss_bringup mkdir -p .obj && cd .obj -%cmake3 \ +%cmake -S .. \ -DCMAKE_INSTALL_PREFIX="/opt/ros/%{ros_distro}" \ -DAMENT_PREFIX_PATH="/opt/ros/%{ros_distro}" \ -DCMAKE_PREFIX_PATH="/opt/ros/%{ros_distro}" \ -UINCLUDE_INSTALL_DIR -ULIB_INSTALL_DIR -USYSCONF_INSTALL_DIR -USHARE_INSTALL_PREFIX -ULIB_SUFFIX \ -DSETUPTOOLS_DEB_LAYOUT=OFF \ - -DBUILD_TESTING=OFF \ - .. + -DBUILD_TESTING=OFF make %{?_smp_mflags} %install diff --git a/sources b/sources index 146588c..20cd68f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f0284e62f4053409163a7456bc7d7ea3 673ba44eaa1a4054747775ee1f1cdd3a8b8a9bbc.tar.gz +26001090d5118b391249d6efc00f787f 673ba44eaa1a4054747775ee1f1cdd3a8b8a9bbc.tar.gz -- cgit v1.2.3