From 0d6a61a2a501b9b65fb68ad60fcb275c44e3fc50 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Thu, 2 Jan 2025 13:36:08 +1000 Subject: [PATCH] Near complete linux-aarch64 local rebuild --- patch/ros-noetic-octomap-server.patch | 13 ------------ patch/ros-noetic-octomap.patch | 13 ++++++++++++ patch/ros-noetic-random-numbers.patch | 18 ---------------- vinca_linux_64.yaml | 28 ++++++++++++------------- vinca_linux_aarch64.yaml | 30 +++++++++++++-------------- 5 files changed, 42 insertions(+), 60 deletions(-) delete mode 100644 patch/ros-noetic-octomap-server.patch delete mode 100644 patch/ros-noetic-random-numbers.patch diff --git a/patch/ros-noetic-octomap-server.patch b/patch/ros-noetic-octomap-server.patch deleted file mode 100644 index c6c02979c..000000000 --- a/patch/ros-noetic-octomap-server.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/octomap_server/src/OctomapServer.cpp b/octomap_server/src/OctomapServer.cpp -index d18eb7dd..e034b170 100644 ---- a/octomap_server/src/OctomapServer.cpp -+++ b/octomap_server/src/OctomapServer.cpp -@@ -924,7 +924,7 @@ void OctomapServer::filterGroundPlane(const PCLPointCloud& pc, PCLPointCloud& gr - second_pass.setInputCloud(pc.makeShared()); - second_pass.filter(ground); - -- second_pass.setFilterLimitsNegative (true); -+ second_pass.setNegative (true); - second_pass.filter(nonground); - } - diff --git a/patch/ros-noetic-octomap.patch b/patch/ros-noetic-octomap.patch index b9ed45bec..7d9ab6f0d 100644 --- a/patch/ros-noetic-octomap.patch +++ b/patch/ros-noetic-octomap.patch @@ -153,3 +153,16 @@ index eae2876d..5dc1d952 100644 + + SET_TESTS_PROPERTIES (ReadGraph PROPERTIES DEPENDS InsertScan) endif() +diff --git a/include/octomap/OcTreeBase.h b/include/octomap/OcTreeBase.h +index d53b4056..ce56da52 100644 +--- a/include/octomap/OcTreeBase.h ++++ b/include/octomap/OcTreeBase.h +@@ -43,7 +43,7 @@ namespace octomap { + template + class OcTreeBase : public OcTreeBaseImpl { + public: +- OcTreeBase(double res) : OcTreeBaseImpl(res) {}; ++ OcTreeBase(double res) : OcTreeBaseImpl(res) {}; + + /// virtual constructor: creates a new object of same type + /// (Covariant return type requires an up-to-date compiler) diff --git a/patch/ros-noetic-random-numbers.patch b/patch/ros-noetic-random-numbers.patch deleted file mode 100644 index fe9bf50d6..000000000 --- a/patch/ros-noetic-random-numbers.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d23bb19..454a378 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,9 +18,12 @@ add_library(${PROJECT_NAME} - - target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES}) - -+set_target_properties(${PROJECT_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) -+ - install(TARGETS ${PROJECT_NAME} - ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -- LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) -+ LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -+ RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}) - - install(DIRECTORY include/${PROJECT_NAME}/ - DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml index dde34fce1..62f166751 100644 --- a/vinca_linux_64.yaml +++ b/vinca_linux_64.yaml @@ -44,22 +44,22 @@ skip_existing: # For sure it will be uncommented and built with next full rebuild. Full rebuilds happen occasionally (few times a year). # The list of all maintained packages is at https://robostack.github.io/noetic.html . packages_select_by_deps: - - cras_cpp_common # maintainer peci1 - - cras_py_common # maintainer peci1 - - cras_docs_common # maintainer peci1 - - cras_topic_tools # maintainer peci1 - - image_transport_codecs # maintainer peci1 - - point_cloud_transport # maintainer peci1 - - point_cloud_transport_plugins # maintainer peci1 - - draco_point_cloud_transport # maintainer peci1 - - sensor_filters # maintainer peci1 - - cras_relative_positional_controller # maintainer peci1 - - cras_msgs # maintainer peci1 - - compass_msgs # maintainer peci1 - - magnetometer_compass # maintainer peci1 + # - cras_cpp_common # maintainer peci1 + # - cras_py_common # maintainer peci1 + # - cras_docs_common # maintainer peci1 + # - cras_topic_tools # maintainer peci1 + # - image_transport_codecs # maintainer peci1 + # - point_cloud_transport # maintainer peci1 + # - point_cloud_transport_plugins # maintainer peci1 + # - draco_point_cloud_transport # maintainer peci1 + # - sensor_filters # maintainer peci1 + # - cras_relative_positional_controller # maintainer peci1 + # - cras_msgs # maintainer peci1 + # - compass_msgs # maintainer peci1 + # - magnetometer_compass # maintainer peci1 - electronic_io_msgs # maintainer peci1 - electronic_io # maintainer peci1 - - point_cloud_color # maintainer peci1 + # - point_cloud_color # maintainer peci1 - rosmsg_cpp # maintainer peci1 - snmp_ros # maintainer peci1 - robot_body_filter # maintainer peci1 diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml index fc187cf53..58f2f8ef3 100644 --- a/vinca_linux_aarch64.yaml +++ b/vinca_linux_aarch64.yaml @@ -36,22 +36,22 @@ skip_existing: # The list of all maintained packages is at https://robostack.github.io/noetic.html . packages_select_by_deps: - rviz # needs to be built locally, CI times out - - cras_cpp_common # maintainer peci1 - - cras_py_common # maintainer peci1 - - cras_docs_common # maintainer peci1 - - cras_topic_tools # maintainer peci1 - - image_transport_codecs # maintainer peci1 - - point_cloud_transport # maintainer peci1 - - point_cloud_transport_plugins # maintainer peci1 - - draco_point_cloud_transport # maintainer peci1 - - sensor_filters # maintainer peci1 - - cras_relative_positional_controller # maintainer peci1 - - cras_msgs # maintainer peci1 - - compass_msgs # maintainer peci1 - - magnetometer_compass # maintainer peci1; does not work on aarch64 in pull requests due to cross-compiling (but okay on master branch) + # - cras_cpp_common # maintainer peci1 + # - cras_py_common # maintainer peci1 + # - cras_docs_common # maintainer peci1 + # - cras_topic_tools # maintainer peci1 + # - image_transport_codecs # maintainer peci1 + # - point_cloud_transport # maintainer peci1 + # - point_cloud_transport_plugins # maintainer peci1 + # - draco_point_cloud_transport # maintainer peci1 + # - sensor_filters # maintainer peci1 + # - cras_relative_positional_controller # maintainer peci1 + # - cras_msgs # maintainer peci1 + # - compass_msgs # maintainer peci1 + # - magnetometer_compass # maintainer peci1; does not work on aarch64 in pull requests due to cross-compiling (but okay on master branch) - electronic_io_msgs # maintainer peci1 - electronic_io # maintainer peci1 - - point_cloud_color # maintainer peci1 + # - point_cloud_color # maintainer peci1 - rosmsg_cpp # maintainer peci1 - snmp_ros # maintainer peci1 - robot_body_filter # maintainer peci1 @@ -152,7 +152,7 @@ packages_select_by_deps: - rosserial-python - ros_numpy - franka_msgs - - teb_local_planner + # - teb_local_planner - rospy-message-converter - turtlebot3 - turtlebot3_fake