diff --git a/bb_fix/all.remove b/bb_fix/all.remove index 118ea2b150144b636b43f4e9bff7d204226c01ee..453efe76434c773d5ad90d725a29478dac118b04 100644 --- a/bb_fix/all.remove +++ b/bb_fix/all.remove @@ -9,3 +9,6 @@ gdb-native libatomic libatomic-native cmake +perl( +perl(ExtUtils-native +eigen3-static-native diff --git a/bb_fix/behaviortree-cpp-v3/fix/APPENDS b/bb_fix/behaviortree-cpp-v3/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..e2ae8fdfe197cb0f4984761dd1344d432f33e5e8 --- /dev/null +++ b/bb_fix/behaviortree-cpp-v3/fix/APPENDS @@ -0,0 +1 @@ +EXTRA_OECMAKE += " -DBUILD_UNIT_TESTS=OFF" diff --git a/bb_fix/bondcpp/files/00-bondcpp-fix-uuid-not-found.patch b/bb_fix/bondcpp/files/00-bondcpp-fix-uuid-not-found.patch new file mode 100644 index 0000000000000000000000000000000000000000..fbc73f4bcf8eaa1e0c7bc8e51bd66cab2e6e4dbb --- /dev/null +++ b/bb_fix/bondcpp/files/00-bondcpp-fix-uuid-not-found.patch @@ -0,0 +1,31 @@ +diff -Naur ros-humble-bondcpp-3.0.2_org/CMakeLists.txt ros-humble-bondcpp-3.0.2/CMakeLists.txt +--- ros-humble-bondcpp-3.0.2_org/CMakeLists.txt 2023-05-26 14:54:48.457765395 +0800 ++++ ros-humble-bondcpp-3.0.2/CMakeLists.txt 2023-05-26 14:55:09.900887997 +0800 +@@ -17,9 +17,9 @@ + find_package(Threads REQUIRED) + + find_package(PkgConfig REQUIRED) +-pkg_check_modules(UUID REQUIRED uuid) ++#pkg_check_modules(UUID REQUIRED uuid) + # we have to find the absolute path to uuid as target_link_directories is not available before cmake 3.13 +-find_library(uuid_ABS_PATH ${UUID_LIBRARIES} PATHS ${UUID_LIBRARY_DIRS}) ++#find_library(uuid_ABS_PATH ${UUID_LIBRARIES} PATHS ${UUID_LIBRARY_DIRS}) + + add_library(${PROJECT_NAME} + SHARED +@@ -28,13 +28,13 @@ + target_include_directories(${PROJECT_NAME} PUBLIC + $ + $ +- ${UUID_INCLUDE_DIRS}) ++ ) + ament_target_dependencies(${PROJECT_NAME} + bond + rclcpp + rclcpp_lifecycle + smclib) +-target_link_libraries(${PROJECT_NAME} ${uuid_ABS_PATH}) ++target_link_libraries(${PROJECT_NAME} uuid) + + install( + TARGETS ${PROJECT_NAME} diff --git a/bb_fix/cartographer/fix/DEPENDS b/bb_fix/cartographer/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..d72bd718b27d099947eead20740278f6f98a5172 --- /dev/null +++ b/bb_fix/cartographer/fix/DEPENDS @@ -0,0 +1,7 @@ +-cmake-native +-git-native +-gtest-native +-python3-sphinx-native ++python3-sphinx ++gtest ++protobuf-native diff --git a/bb_fix/catch2/fix/APPENDS b/bb_fix/catch2/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..a670c713f3f62ca266d068a312e0c2eed4fed265 --- /dev/null +++ b/bb_fix/catch2/fix/APPENDS @@ -0,0 +1,3 @@ +FILES:${PN}-dev += " \ + ${datadir}/Catch2 \ +" diff --git a/bb_fix/ceres-solver/fix/APPENDS b/bb_fix/ceres-solver/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..634b004133d1a44566b91b60c7007069d336513e --- /dev/null +++ b/bb_fix/ceres-solver/fix/APPENDS @@ -0,0 +1,4 @@ +EXTRA_OECMAKE += " -DBUILD_TESTING=OFF" + +ALLOW_EMPTY:${PN} = "1" + diff --git a/bb_fix/ceres-solver/fix/DEPENDS b/bb_fix/ceres-solver/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..7456290c3fe1be7aec8e0d39b9576159cf5a7c08 --- /dev/null +++ b/bb_fix/ceres-solver/fix/DEPENDS @@ -0,0 +1,5 @@ +-%{blaslib}-native +-suitesparse-native +-tbb-native ++suitesparse ++tbb diff --git a/bb_fix/compressed-depth-image-transport/files/00-compressed-depth-image-transport-fix-g++10-error.patch b/bb_fix/compressed-depth-image-transport/files/00-compressed-depth-image-transport-fix-g++10-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..d4180a179dfa392c9ed84428a16659e291ccbf25 --- /dev/null +++ b/bb_fix/compressed-depth-image-transport/files/00-compressed-depth-image-transport-fix-g++10-error.patch @@ -0,0 +1,11 @@ +--- ros-humble-compressed-depth-image-transport-2.5.0/CMakeLists.txt_org 2023-05-30 19:17:28.452736654 +0800 ++++ ros-humble-compressed-depth-image-transport-2.5.0/CMakeLists.txt 2023-05-30 19:18:14.454000180 +0800 +@@ -19,6 +19,8 @@ + + include_directories(include ${OpenCV_INCLUDE_DIRS}) + ++add_compile_options(-Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security) ++ + add_library( + ${PROJECT_NAME} + SHARED diff --git a/bb_fix/cppzmq/fix/APPENDS b/bb_fix/cppzmq/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..7b9e097d204234aec13e6b7cd42bb14247102d18 --- /dev/null +++ b/bb_fix/cppzmq/fix/APPENDS @@ -0,0 +1,2 @@ +EXTRA_OECMAKE += " -DCPPZMQ_BUILD_TESTS=OFF" +ALLOW_EMPTY:${PN} = "1" diff --git a/bb_fix/cppzmq/fix/DEPENDS b/bb_fix/cppzmq/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..3c69559c24404e811578864ee3b915132bd3f0fd --- /dev/null +++ b/bb_fix/cppzmq/fix/DEPENDS @@ -0,0 +1,5 @@ +-pkgconfig(libzmq)-native +-catch2-native +-zeromq-native ++catch2 ++zeromq diff --git a/bb_fix/cppzmq/fix/RDEPENDS b/bb_fix/cppzmq/fix/RDEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..08568c5879b79d26337cc9c501461c32b90f56ce --- /dev/null +++ b/bb_fix/cppzmq/fix/RDEPENDS @@ -0,0 +1 @@ +-pkgconfig(libzmq) diff --git a/bb_fix/cv-bridge/fix/DEPENDS b/bb_fix/cv-bridge/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..890d970aa1e2d53e00f84b899e82ca372d4524de --- /dev/null +++ b/bb_fix/cv-bridge/fix/DEPENDS @@ -0,0 +1,4 @@ +-boost-native +-python3-numpy ++boost ++python3-numpy-native diff --git a/bb_fix/cv-bridge/fix/RDEPENDS b/bb_fix/cv-bridge/fix/RDEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..8a9d018f6c703b3a841232a302cccb558b872ce8 --- /dev/null +++ b/bb_fix/cv-bridge/fix/RDEPENDS @@ -0,0 +1 @@ +-boost-python3 diff --git a/bb_fix/dwb-core/fix/APPENDS b/bb_fix/dwb-core/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..29316f4e4a971548ee502c1d100336f44bd00cf2 --- /dev/null +++ b/bb_fix/dwb-core/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security" diff --git a/bb_fix/dwb-critics/fix/APPENDS b/bb_fix/dwb-critics/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..c8c86dc1dc2bff5eb61857df37fb939cc06d4be1 --- /dev/null +++ b/bb_fix/dwb-critics/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations" diff --git a/bb_fix/dwb-msgs/fix/DEPENDS b/bb_fix/dwb-msgs/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..5bd2aa805cc25748cb1b0db49671b755ac7af99d --- /dev/null +++ b/bb_fix/dwb-msgs/fix/DEPENDS @@ -0,0 +1,9 @@ ++ament-cmake-ros-native ++rosidl-generator-c-native ++rosidl-generator-cpp-native ++rosidl-generator-py-native ++rosidl-typesupport-introspection-cpp-native ++rosidl-typesupport-fastrtps-cpp-native ++rosidl-typesupport-fastrtps-c-native ++rosidl-typesupport-cpp-native ++rosidl-adapter-native diff --git a/bb_fix/dwb-plugins/fix/APPENDS b/bb_fix/dwb-plugins/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..c8c86dc1dc2bff5eb61857df37fb939cc06d4be1 --- /dev/null +++ b/bb_fix/dwb-plugins/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations" diff --git a/bb_fix/flann/fix/APPENDS b/bb_fix/flann/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..cbc9754724fd029c8fb16411718d5fdea566bb7a --- /dev/null +++ b/bb_fix/flann/fix/APPENDS @@ -0,0 +1,2 @@ +EXTRA_OECMAKE += " -DBUILD_MATLAB_BINDINGS=OFF -DBUILD_PYTHON_BINDINGS=ON -DBUILD_TESTS=OFF" + diff --git a/bb_fix/flann/fix/DEPENDS b/bb_fix/flann/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..28a83fc452e01bc134143dea42dbc33080b757b6 --- /dev/null +++ b/bb_fix/flann/fix/DEPENDS @@ -0,0 +1,5 @@ +-texlive-bibtex-native +-texlive-latex-native +-texlive-tetex-native +-latex2html-native +-hdf5-native diff --git a/bb_fix/graphicsmagick/fix/APPENDS b/bb_fix/graphicsmagick/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..99f4d66e1577ed82a255f4c5193d28caa26ae8fa --- /dev/null +++ b/bb_fix/graphicsmagick/fix/APPENDS @@ -0,0 +1,7 @@ +inherit autotools +EXTRA_OECONF += "--enable-static=no --enable-shared=yes" +FILES:${PN}-dev += " \ + ${datadir}/GraphicsMagick-1.3.30 \ + ${libdir}/GraphicsMagick-1.3.30 \ +" + diff --git a/bb_fix/graphicsmagick/fix/DEPENDS b/bb_fix/graphicsmagick/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..d26f89e9b9af08dcd9bb4ef4bd3408dd55771971 --- /dev/null +++ b/bb_fix/graphicsmagick/fix/DEPENDS @@ -0,0 +1,13 @@ +-jbigkit-native +-lcms2-native +-libjpeg-native +-librsvg2-native +-libtiff-native +-libtool-ltdl-native +-libwebp-native +-libX11-native +-libXext-native +-libXt-native +-lpr-native +-perl-generators-native +-xdg-utils-native diff --git a/bb_fix/graphicsmagick/fix/RDEPENDS b/bb_fix/graphicsmagick/fix/RDEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..67e3e876b0cc487d6d01f87cf05e5c29f96e5c86 --- /dev/null +++ b/bb_fix/graphicsmagick/fix/RDEPENDS @@ -0,0 +1 @@ +-urw-fonts diff --git a/bb_fix/libyaml-vendor/files/1-libyaml-vendor-use-system-libyaml.patch b/bb_fix/libyaml-vendor/files/1-libyaml-vendor-use-system-libyaml.patch new file mode 100644 index 0000000000000000000000000000000000000000..2f178453a4306b30ef1f3350fc49c7ed9bad544c --- /dev/null +++ b/bb_fix/libyaml-vendor/files/1-libyaml-vendor-use-system-libyaml.patch @@ -0,0 +1,25 @@ +diff -Naur ros-humble-libyaml-vendor-1.2.2_org/CMakeLists.txt ros-humble-libyaml-vendor-1.2.2/CMakeLists.txt +--- ros-humble-libyaml-vendor-1.2.2_org/CMakeLists.txt 2023-05-14 21:45:23.823005698 +0800 ++++ ros-humble-libyaml-vendor-1.2.2/CMakeLists.txt 2023-05-26 17:27:33.343895132 +0800 +@@ -92,11 +92,18 @@ + set(yaml_LIBRARIES yaml) + endmacro() + +-build_libyaml() +-set(extra_test_dependencies libyaml-0.2.5) ++#build_libyaml() ++#set(extra_test_dependencies libyaml-0.2.5) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(YAML REQUIRED) ++if(YAML_FOUND) ++ message(STATUS "Found yaml ${YAML_VERSION}") ++else() ++ message(FATAL_ERROR "yaml not found") ++endif() + + ament_export_libraries(yaml) +-ament_export_dependencies(yaml) ++#ament_export_dependencies(yaml) + + if(BUILD_TESTING) + find_package(ament_lint_auto REQUIRED) diff --git a/bb_fix/libyaml-vendor/fix/APPENDS b/bb_fix/libyaml-vendor/fix/APPENDS index 2e35e7281f89266b87b2d1f2d919074414597bee..29c94c16706bf2c077289dfc2178b04bddba881f 100644 --- a/bb_fix/libyaml-vendor/fix/APPENDS +++ b/bb_fix/libyaml-vendor/fix/APPENDS @@ -6,6 +6,10 @@ SYSROOT_DIRS:append = " \ ${ros_prefix}/cmake \ " +SYSROOT_DIRS_NATIVE:append = " \ + ${prefix}/cmake \ +" + FILES:${PN}:append = " \ ${ros_prefix}/lib \ " @@ -15,3 +19,11 @@ FILES:${PN}-dev:remove = "\ FILES:${PN}-dev:append = " \ ${ros_prefix}/cmake \ " + +DEPENDS:append = " \ + libyaml \ +" + +RDEPENDS:${PN}:append = " \ + libyaml \ +" diff --git a/bb_fix/metis/fix/APPENDS b/bb_fix/metis/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..afee763116412665777d15e365364e8d21481ac3 --- /dev/null +++ b/bb_fix/metis/fix/APPENDS @@ -0,0 +1,23 @@ +SRC_URI_remove += " \ + file://${OPENEULER_LOCAL_NAME}/metis-width-datatype.patch \ + file://${OPENEULER_LOCAL_NAME}/metis_lib64.patch \ +" + +do_patch() { + cd ${S} + patch -p0 file://${OPENEULER_LOCAL_NAME}/metis-libmetis.patch + patch -p0 file://${OPENEULER_LOCAL_NAME}/metis-shared-GKlib.patch + patch -p0 file://${OPENEULER_LOCAL_NAME}/metis-GKREGEX-GKRAND-LIBSUFFIX-fix.patch + patch -p0 file://${OPENEULER_LOCAL_NAME}/metis-pcre2.patch +} + +EXTRA_OECMAKE += "-DGKLIB_PATH=${S}/GKlib -DSHARED=1" + +FILES:${PN} += " \ + ${prefix}/lib/lib*.so \ +" + +SYSROOT_DIRS:append = " \ + ${prefix}/lib \ +" + diff --git a/bb_fix/nav-2d-msgs/fix/DEPENDS b/bb_fix/nav-2d-msgs/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..5bd2aa805cc25748cb1b0db49671b755ac7af99d --- /dev/null +++ b/bb_fix/nav-2d-msgs/fix/DEPENDS @@ -0,0 +1,9 @@ ++ament-cmake-ros-native ++rosidl-generator-c-native ++rosidl-generator-cpp-native ++rosidl-generator-py-native ++rosidl-typesupport-introspection-cpp-native ++rosidl-typesupport-fastrtps-cpp-native ++rosidl-typesupport-fastrtps-c-native ++rosidl-typesupport-cpp-native ++rosidl-adapter-native diff --git a/bb_fix/nav-2d-utils/fix/APPENDS b/bb_fix/nav-2d-utils/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..29316f4e4a971548ee502c1d100336f44bd00cf2 --- /dev/null +++ b/bb_fix/nav-2d-utils/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security" diff --git a/bb_fix/nav2-amcl/fix/APPENDS b/bb_fix/nav2-amcl/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..29316f4e4a971548ee502c1d100336f44bd00cf2 --- /dev/null +++ b/bb_fix/nav2-amcl/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security" diff --git a/bb_fix/nav2-behavior-tree/files/00-nav2-behavior-tree-fix-format-security-error.patch b/bb_fix/nav2-behavior-tree/files/00-nav2-behavior-tree-fix-format-security-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..4b49a1d4432a4804e4901b66b48f85da59ddc285 --- /dev/null +++ b/bb_fix/nav2-behavior-tree/files/00-nav2-behavior-tree-fix-format-security-error.patch @@ -0,0 +1,11 @@ +diff -Naur ros-humble-nav2-behavior-tree-1.1.6_org/CMakeLists.txt ros-humble-nav2-behavior-tree-1.1.6/CMakeLists.txt +--- ros-humble-nav2-behavior-tree-1.1.6_org/CMakeLists.txt 2023-05-27 22:16:39.149893987 +0800 ++++ ros-humble-nav2-behavior-tree-1.1.6/CMakeLists.txt 2023-05-27 22:16:07.360701746 +0800 +@@ -18,6 +18,7 @@ + find_package(std_srvs REQUIRED) + find_package(nav2_util REQUIRED) + ++add_compile_options(-Wno-error=format-security) + nav2_package() + + include_directories( diff --git a/bb_fix/nav2-behavior-tree/fix/APPENDS b/bb_fix/nav2-behavior-tree/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..29316f4e4a971548ee502c1d100336f44bd00cf2 --- /dev/null +++ b/bb_fix/nav2-behavior-tree/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security" diff --git a/bb_fix/nav2-behaviors/fix/APPENDS b/bb_fix/nav2-behaviors/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..c8c86dc1dc2bff5eb61857df37fb939cc06d4be1 --- /dev/null +++ b/bb_fix/nav2-behaviors/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations" diff --git a/bb_fix/nav2-behaviors/fix/DEPENDS b/bb_fix/nav2-behaviors/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..417f7d3dd697a89d9d4cebc14de4314a75a258b4 --- /dev/null +++ b/bb_fix/nav2-behaviors/fix/DEPENDS @@ -0,0 +1,2 @@ +-tf2-geometry-msgs-native ++tf2-geometry-msgs diff --git a/bb_fix/nav2-bt-navigator/fix/APPENDS b/bb_fix/nav2-bt-navigator/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..c8c86dc1dc2bff5eb61857df37fb939cc06d4be1 --- /dev/null +++ b/bb_fix/nav2-bt-navigator/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations" diff --git a/bb_fix/nav2-collision-monitor/fix/APPENDS b/bb_fix/nav2-collision-monitor/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..29316f4e4a971548ee502c1d100336f44bd00cf2 --- /dev/null +++ b/bb_fix/nav2-collision-monitor/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security" diff --git a/bb_fix/nav2-constrained-smoother/fix/APPENDS b/bb_fix/nav2-constrained-smoother/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..c8c86dc1dc2bff5eb61857df37fb939cc06d4be1 --- /dev/null +++ b/bb_fix/nav2-constrained-smoother/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations" diff --git a/bb_fix/nav2-constrained-smoother/fix/DEPENDS b/bb_fix/nav2-constrained-smoother/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..575461d14f27888cab00e399474d3b77c2071b2c --- /dev/null +++ b/bb_fix/nav2-constrained-smoother/fix/DEPENDS @@ -0,0 +1 @@ ++suitesparse diff --git a/bb_fix/nav2-controller/files/00-nav2-controller-fix-g++10-error.patch b/bb_fix/nav2-controller/files/00-nav2-controller-fix-g++10-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..3bef5cbd942105bb2ddff0dec690354a9830dfa6 --- /dev/null +++ b/bb_fix/nav2-controller/files/00-nav2-controller-fix-g++10-error.patch @@ -0,0 +1,10 @@ +--- ros-humble-nav2-controller-1.1.6/CMakeLists.txt_org 2023-05-30 10:49:39.645976372 +0800 ++++ ros-humble-nav2-controller-1.1.6/CMakeLists.txt 2023-05-30 10:50:37.242341632 +0800 +@@ -21,6 +21,7 @@ + include + ) + ++add_compile_options(-Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security) + set(executable_name controller_server) + + add_executable(${executable_name} diff --git a/bb_fix/nav2-costmap-2d/files/00-nav2-costmap-fix-g++10-error.patch b/bb_fix/nav2-costmap-2d/files/00-nav2-costmap-fix-g++10-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..eac2196c9c036882ea605aef2613ae727fb8e94f --- /dev/null +++ b/bb_fix/nav2-costmap-2d/files/00-nav2-costmap-fix-g++10-error.patch @@ -0,0 +1,11 @@ +diff -Naur ros-humble-nav2-costmap-2d-1.1.6_org/CMakeLists.txt ros-humble-nav2-costmap-2d-1.1.6/CMakeLists.txt +--- ros-humble-nav2-costmap-2d-1.1.6_org/CMakeLists.txt 2023-05-27 17:44:05.955546861 +0800 ++++ ros-humble-nav2-costmap-2d-1.1.6/CMakeLists.txt 2023-05-27 17:44:26.912673760 +0800 +@@ -37,6 +37,7 @@ + + add_definitions(${EIGEN3_DEFINITIONS}) + ++add_compile_options(-Wno-error=format-security -Wno-error=maybe-uninitialized) + add_library(nav2_costmap_2d_core SHARED + src/array_parser.cpp + src/costmap_2d.cpp diff --git a/bb_fix/nav2-costmap-2d/fix/APPENDS b/bb_fix/nav2-costmap-2d/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..29316f4e4a971548ee502c1d100336f44bd00cf2 --- /dev/null +++ b/bb_fix/nav2-costmap-2d/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security" diff --git a/bb_fix/nav2-lifecycle-manager/fix/APPENDS b/bb_fix/nav2-lifecycle-manager/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..c8c86dc1dc2bff5eb61857df37fb939cc06d4be1 --- /dev/null +++ b/bb_fix/nav2-lifecycle-manager/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations" diff --git a/bb_fix/nav2-map-server/fix/APPENDS b/bb_fix/nav2-map-server/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..c8c86dc1dc2bff5eb61857df37fb939cc06d4be1 --- /dev/null +++ b/bb_fix/nav2-map-server/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations" diff --git a/bb_fix/nav2-navfn-planner/fix/APPENDS b/bb_fix/nav2-navfn-planner/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..29316f4e4a971548ee502c1d100336f44bd00cf2 --- /dev/null +++ b/bb_fix/nav2-navfn-planner/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security" diff --git a/bb_fix/nav2-planner/fix/APPENDS b/bb_fix/nav2-planner/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..c8c86dc1dc2bff5eb61857df37fb939cc06d4be1 --- /dev/null +++ b/bb_fix/nav2-planner/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations" diff --git a/bb_fix/nav2-regulated-pure-pursuit-controller/fix/APPENDS b/bb_fix/nav2-regulated-pure-pursuit-controller/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..29316f4e4a971548ee502c1d100336f44bd00cf2 --- /dev/null +++ b/bb_fix/nav2-regulated-pure-pursuit-controller/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security" diff --git a/bb_fix/nav2-rotation-shim-controller/fix/APPENDS b/bb_fix/nav2-rotation-shim-controller/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..29316f4e4a971548ee502c1d100336f44bd00cf2 --- /dev/null +++ b/bb_fix/nav2-rotation-shim-controller/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security" diff --git a/bb_fix/nav2-rviz-plugins/fix/DEPENDS b/bb_fix/nav2-rviz-plugins/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..c2f2c8af9c2a715cf726017b5b10ae64d9f9b42c --- /dev/null +++ b/bb_fix/nav2-rviz-plugins/fix/DEPENDS @@ -0,0 +1 @@ +-qt5-qtbase-native diff --git a/bb_fix/nav2-rviz-plugins/fix/RDEPENDS b/bb_fix/nav2-rviz-plugins/fix/RDEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..eba1c8184c2e7cba503192eeb5655d1ae035b125 --- /dev/null +++ b/bb_fix/nav2-rviz-plugins/fix/RDEPENDS @@ -0,0 +1,2 @@ +-qt5-qtbase +-qt5-qtbase-gui diff --git a/bb_fix/nav2-simple-commander/fix/APPENDS b/bb_fix/nav2-simple-commander/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..c39d689bd907e1bf8c689d04f48fa6dd3618e479 --- /dev/null +++ b/bb_fix/nav2-simple-commander/fix/APPENDS @@ -0,0 +1 @@ +INSANE_SKIP:${PN} += "shebang-size" diff --git a/bb_fix/nav2-smoother/files/00-nav2-smoother-fix-g++10-error.patch b/bb_fix/nav2-smoother/files/00-nav2-smoother-fix-g++10-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..dd34d91398d1817ed83e2b21388cace15fdc2bd3 --- /dev/null +++ b/bb_fix/nav2-smoother/files/00-nav2-smoother-fix-g++10-error.patch @@ -0,0 +1,12 @@ +diff -Naur ros-humble-nav2-smoother-1.1.6_org/CMakeLists.txt ros-humble-nav2-smoother-1.1.6/CMakeLists.txt +--- ros-humble-nav2-smoother-1.1.6_org/CMakeLists.txt 2023-05-28 08:37:01.941396149 +0800 ++++ ros-humble-nav2-smoother-1.1.6/CMakeLists.txt 2023-05-28 08:41:34.703989214 +0800 +@@ -26,6 +26,8 @@ + include + ) + ++add_compile_options(-Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security) ++ + set(executable_name smoother_server) + set(library_name ${executable_name}_core) + diff --git a/bb_fix/nav2-theta-star-planner/fix/APPENDS b/bb_fix/nav2-theta-star-planner/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..29316f4e4a971548ee502c1d100336f44bd00cf2 --- /dev/null +++ b/bb_fix/nav2-theta-star-planner/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security" diff --git a/bb_fix/nav2-util/fix/APPENDS b/bb_fix/nav2-util/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..29316f4e4a971548ee502c1d100336f44bd00cf2 --- /dev/null +++ b/bb_fix/nav2-util/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security" diff --git a/bb_fix/nav2-velocity-smoother/fix/APPENDS b/bb_fix/nav2-velocity-smoother/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..29316f4e4a971548ee502c1d100336f44bd00cf2 --- /dev/null +++ b/bb_fix/nav2-velocity-smoother/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=format-security" diff --git a/bb_fix/nav2-voxel-grid/fix/APPENDS b/bb_fix/nav2-voxel-grid/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..0a27622da7c1550a13616613251f07c41b710168 --- /dev/null +++ b/bb_fix/nav2-voxel-grid/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated" diff --git a/bb_fix/nav2-waypoint-follower/fix/APPENDS b/bb_fix/nav2-waypoint-follower/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..c8c86dc1dc2bff5eb61857df37fb939cc06d4be1 --- /dev/null +++ b/bb_fix/nav2-waypoint-follower/fix/APPENDS @@ -0,0 +1 @@ +CXXFLAGS += " -Wno-error=deprecated -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations" diff --git a/bb_fix/navigation2/fix/RDEPENDS b/bb_fix/navigation2/fix/RDEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..029d6af7a07fa0df7d5bc5cd12f3aa4c138c897f --- /dev/null +++ b/bb_fix/navigation2/fix/RDEPENDS @@ -0,0 +1,3 @@ +-nav2-constrained-smoother +-nav2-rviz-plugins +-nav2-smac-planner diff --git a/bb_fix/originbot-base/files/00-originbot-base-fix-error.patch b/bb_fix/originbot-base/files/00-originbot-base-fix-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..99e249fd81b5f98ff22371f7ec541e2d0abea24f --- /dev/null +++ b/bb_fix/originbot-base/files/00-originbot-base-fix-error.patch @@ -0,0 +1,26 @@ +--- originbot_base/src/originbot_base.cpp_org 2023-05-30 11:12:44.857538312 +0800 ++++ originbot_base/src/originbot_base.cpp 2023-05-30 11:25:38.522997804 +0800 +@@ -20,17 +20,17 @@ + { + // 加载参数 + std::string port_name="ttyS3"; +- this->declare_parameter("port_name"); //声明及获取串口号参数 ++ this->declare_parameter("port_name"); //声明及获取串口号参数 + this->get_parameter_or("port_name", port_name, "ttyS3"); +- this->declare_parameter("correct_factor_vx"); //声明及获取线速度校正参数 ++ this->declare_parameter("correct_factor_vx"); //声明及获取线速度校正参数 + this->get_parameter_or("correct_factor_vx", correct_factor_vx_, 1.0); +- this->declare_parameter("correct_factor_vth"); //声明及获取角速度校正参数 ++ this->declare_parameter("correct_factor_vth"); //声明及获取角速度校正参数 + this->get_parameter_or("correct_factor_vth", correct_factor_vth_, 1.0); +- this->declare_parameter("auto_stop_on"); //声明及获取自动停车功能的开关值 ++ this->declare_parameter("auto_stop_on"); //声明及获取自动停车功能的开关值 + this->get_parameter_or("auto_stop_on", auto_stop_on_, true); +- this->declare_parameter("use_imu"); //声明是否使用imu ++ this->declare_parameter("use_imu"); //声明是否使用imu + this->get_parameter_or("use_imu", use_imu_, false); +- this->declare_parameter("pub_odom"); //声明是否发布odom的tf ++ this->declare_parameter("pub_odom"); //声明是否发布odom的tf + this->get_parameter_or("pub_odom", pub_odom_, false); + + // 打印加载的参数值 diff --git a/bb_fix/originbot-bringup/files/00-originbot-bringup-remove-teleop-twist-joy.patch b/bb_fix/originbot-bringup/files/00-originbot-bringup-remove-teleop-twist-joy.patch new file mode 100644 index 0000000000000000000000000000000000000000..2167d6c9d46b7d4527f0327ff9aef1c650717792 --- /dev/null +++ b/bb_fix/originbot-bringup/files/00-originbot-bringup-remove-teleop-twist-joy.patch @@ -0,0 +1,11 @@ +--- originbot_bringup/CMakeLists.txt_org 2023-05-30 11:04:52.950665464 +0800 ++++ originbot_bringup/CMakeLists.txt 2023-05-30 11:02:52.610932859 +0800 +@@ -27,7 +27,7 @@ + find_package(geometry_msgs REQUIRED) + find_package(tf2_ros REQUIRED) + find_package(joy_linux REQUIRED) +-find_package(teleop_twist_joy REQUIRED) ++#find_package(teleop_twist_joy REQUIRED) + + install( + DIRECTORY launch param config diff --git a/bb_fix/originbot-bringup/fix/DEPENDS b/bb_fix/originbot-bringup/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..b8bb81fd01f506ba2ad3491979ff6d91b6461672 --- /dev/null +++ b/bb_fix/originbot-bringup/fix/DEPENDS @@ -0,0 +1 @@ +-teleop-twist-joy-native diff --git a/bb_fix/originbot-bringup/fix/RDEPENDS b/bb_fix/originbot-bringup/fix/RDEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..104acc7c8a5c4e9538412e6907ba0d5036a5bd2f --- /dev/null +++ b/bb_fix/originbot-bringup/fix/RDEPENDS @@ -0,0 +1 @@ +-teleop-twist-joy diff --git a/bb_fix/originbot-navigation/files/00-originbot-navigation-fix-humble.patch b/bb_fix/originbot-navigation/files/00-originbot-navigation-fix-humble.patch new file mode 100644 index 0000000000000000000000000000000000000000..2afee6a604f07f9986f1b85e2dd4c05e9eb26f40 --- /dev/null +++ b/bb_fix/originbot-navigation/files/00-originbot-navigation-fix-humble.patch @@ -0,0 +1,15 @@ +--- originbot_navigation/launch/occupancy_grid.launch.py_org 2023-05-30 20:29:06.269595408 +0800 ++++ originbot_navigation/launch/occupancy_grid.launch.py 2023-05-30 20:29:45.577828047 +0800 +@@ -43,9 +43,9 @@ + + Node( + package='cartographer_ros', +- executable='occupancy_grid_node', ++ executable='cartographer_occupancy_grid_node', + name='occupancy_grid_node', + output='screen', + parameters=[{'use_sim_time': use_sim_time}], + arguments=['-resolution', resolution, '-publish_period_sec', publish_period_sec]), +- ]) +\ No newline at end of file ++ ]) diff --git a/bb_fix/orocos-kdl/fix/APPENDS b/bb_fix/orocos-kdl/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..4aa0b5bbc2117f9607d29e7b5578846d5e0ada6c --- /dev/null +++ b/bb_fix/orocos-kdl/fix/APPENDS @@ -0,0 +1,9 @@ +FILES:${PN}-dev += " \ + ${datadir}/orocos_kdl/cmake \ +" +S := "${WORKDIR}/orocos_kinematics_dynamics-1.5.1/orocos_kdl" + +SRC_URI_remove += " \ + file://${OPENEULER_LOCAL_NAME}/orocos-kdl.pybind11.patch \ + file://${OPENEULER_LOCAL_NAME}/orocos-kdl.python-site-packages.patch \ +" diff --git a/bb_fix/orocos-kdl/fix/DEPENDS b/bb_fix/orocos-kdl/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..9ea238f5090b067342a5880991e1c83356f04a33 --- /dev/null +++ b/bb_fix/orocos-kdl/fix/DEPENDS @@ -0,0 +1,2 @@ +-graphviz-native +-libeigen-native diff --git a/bb_fix/pcl/files/00-pcl-fix-pcl-root.patch b/bb_fix/pcl/files/00-pcl-fix-pcl-root.patch new file mode 100644 index 0000000000000000000000000000000000000000..6c553ed234a45b3dc7da7096d8fa7ff3bf06a794 --- /dev/null +++ b/bb_fix/pcl/files/00-pcl-fix-pcl-root.patch @@ -0,0 +1,11 @@ +--- pcl-pcl-1.12.1/PCLConfig.cmake.in_org 2023-05-30 08:25:44.499647259 +0800 ++++ pcl-pcl-1.12.1/PCLConfig.cmake.in 2023-05-30 08:26:03.906767882 +0800 +@@ -390,7 +390,7 @@ + endif() + else() + # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y +- set(PCL_ROOT "@CMAKE_INSTALL_PREFIX@") ++ get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) + endif() + + # check whether PCLConfig.cmake is found into a PCL installation or in a build tree diff --git a/bb_fix/pcl/fix/APPENDS b/bb_fix/pcl/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..967803fbed42f839a1bb169aa84d201adcc4e3fe --- /dev/null +++ b/bb_fix/pcl/fix/APPENDS @@ -0,0 +1,42 @@ +EXTRA_OECMAKE += "\ + -DCMAKE_SKIP_RPATH=ON \ + -DHAVE_MM_MALLOC_EXITCODE=0 -DHAVE_MM_MALLOC_EXITCODE__TRYRUN_OUTPUT=0 \ + -DHAVE_POSIX_MEMALIGN_EXITCODE=0 -DHAVE_POSIX_MEMALIGN_EXITCODE__TRYRUN_OUTPUT=0 \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DHAVE_SSE4_2_EXTENSIONS_EXITCODE=0 -DHAVE_SSE4_2_EXTENSIONS_EXITCODE__TRYRUN_OUTPUT=0", "-DHAVE_SSE4_2_EXTENSIONS_EXITCODE=1 -DHAVE_SSE4_2_EXTENSIONS_EXITCODE__TRYRUN_OUTPUT=1", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DHAVE_SSE4_1_EXTENSIONS_EXITCODE=0 -DHAVE_SSE4_1_EXTENSIONS_EXITCODE__TRYRUN_OUTPUT=0", "-DHAVE_SSE4_1_EXTENSIONS_EXITCODE=1 -DHAVE_SSE4_1_EXTENSIONS_EXITCODE__TRYRUN_OUTPUT=1", d)} \ + -DHAVE_SSSE3_EXTENSIONS_EXITCODE=0 -DHAVE_SSSE3_EXTENSIONS_EXITCODE__TRYRUN_OUTPUT=0 \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DHAVE_SSE3_EXTENSIONS_EXITCODE=0 -DHAVE_SSE3_EXTENSIONS_EXITCODE__TRYRUN_OUTPUT=0", "-DHAVE_SSE3_EXTENSIONS_EXITCODE=1 -DHAVE_SSE3_EXTENSIONS_EXITCODE__TRYRUN_OUTPUT=1", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse2", "-DHAVE_SSE2_EXTENSIONS_EXITCODE=0 -DHAVE_SSE2_EXTENSIONS_EXITCODE__TRYRUN_OUTPUT=0", "-DHAVE_SSE2_EXTENSIONS_EXITCODE=1 -DHAVE_SSE2_EXTENSIONS_EXITCODE__TRYRUN_OUTPUT=1", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse", "-DHAVE_SSE_EXTENSIONS_EXITCODE=0 -DHAVE_SSE_EXTENSIONS_EXITCODE__TRYRUN_OUTPUT=0", "-DHAVE_SSE_EXTENSIONS_EXITCODE=1 -DHAVE_SSE_EXTENSIONS_EXITCODE__TRYRUN_OUTPUT=1", d)} \ + -DWITH_LIBUSB=FALSE \ + -DWITH_PNG=FALSE \ + -DWITH_QHULL=TRUE \ + -DWITH_CUDA=FALSE \ + -DWITH_QT=FALSE \ + -DWITH_VTK=FALSE \ + -DWITH_PCAP=FALSE \ + -DWITH_OPENGL=FALSE \ +" + +#Setting -ffloat-store to alleviate 32bit vs 64bit discrepancies on non-SSE platforms. +CXXFLAGS += "${@bb.utils.contains("TARGET_CC_ARCH", "-mfpmath=sse", "", "-ffloat-store", d)}" + +FILES:${PN}-dev += " \ + ${datadir}/${BPN}-*/*.cmake \ + ${datadir}/${BPN}-*/Modules/*.cmake \ + ${prefix}/lib/pkgconfig \ +" + +FILES:${PN} += " \ + ${prefix}/lib/libpcl*.so.* \ +" + +FILES:${PN}-dev += " \ + ${prefix}/lib/libpcl*.so \ +" + +SYSROOT_DIRS:append = " \ + ${prefix}/lib \ +" + +INSANE_SKIP:${PN}-dev += "libdir" diff --git a/bb_fix/pcl/fix/DEPENDS b/bb_fix/pcl/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..53b35e22a68ab6f8c30bcdbcdf012a76a93bf1a3 --- /dev/null +++ b/bb_fix/pcl/fix/DEPENDS @@ -0,0 +1,23 @@ +-boost-native +-cmake-native +-doxygen-native +-eigen3-static-native +-flann-static-native +-gl2ps-native +-graphviz-native +-gtest-native +-hdf5-native +-java-native +-jsoncpp-native +-libusb +-libusbx-native +-libXext-native +-libxml2-native +-metslib-static-native +-netcdf-native +-openni-native +-pkgconfig +-qt5-qtbase-native +-qt5-qtwebkit-native +-texlive-latex-native ++boost diff --git a/bb_fix/pcl/fix/RDEPENDS b/bb_fix/pcl/fix/RDEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..89343b34785fbfbd6bc44b5511f756f96179d495 --- /dev/null +++ b/bb_fix/pcl/fix/RDEPENDS @@ -0,0 +1,4 @@ +-flann-static +-libusb +-openni +-pkgconfig diff --git a/bb_fix/pkg.remap b/bb_fix/pkg.remap index 4b0ac09e0d5e47926266b646c4ea2d4cf0a8b342..9e75397b30f57c4e6e5aa1c747472f4727b63910 100644 --- a/bb_fix/pkg.remap +++ b/bb_fix/pkg.remap @@ -63,3 +63,14 @@ ament-pyflakes ament-pyflakes-native ament-uncrustify ament-uncrustify-native ament-xmllint ament-xmllint-native ament-cmake-ros ament-cmake-ros-native +GraphicsMagick-c++-devel graphicsmagick +boost-program-options boost +SDL2-devel libsdl2 +Catch2-devel catch2 +Catch2-native catch2-native +libuuid-devel util-linux +eigen3-devel libeigen +eigen3 libeigen +eigen3-native libeigen-native +sqlite-devel sqlite3 +libcurl-devel curl diff --git a/bb_fix/qhull/fix/APPENDS b/bb_fix/qhull/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..894756630f8000433eaa76dc688b0f729fff22d1 --- /dev/null +++ b/bb_fix/qhull/fix/APPENDS @@ -0,0 +1,15 @@ +FILES:${PN} += " \ + ${prefix}/lib/*.so* \ +" + +FILES:${PN}-staticdev += " \ + ${prefix}/lib/*.a \ +" + +CFLAGS += "-fPIC" + +EXTRA_OECMAKE += "\ + -DCMAKE_SKIP_RPATH=ON \ +" +INSANE_SKIP:${PN} += "dev-so" + diff --git a/bb_fix/rclpy/fix/APPENDS b/bb_fix/rclpy/fix/APPENDS index 44f201359d74d63274b614fedcc411fbbb0f4b5c..0858fb351f6e4fc7f92398c5ab34ce224849aaf8 100644 --- a/bb_fix/rclpy/fix/APPENDS +++ b/bb_fix/rclpy/fix/APPENDS @@ -1,6 +1,10 @@ # fix link error do_configure:prepend() { - rm -f ${STAGING_DIR_NATIVE}/usr/lib/libpython*.so + native=`echo ${PN} | grep "\-native$" || echo ""` + if [ "${native}" == "" ] + then + rm -f ${STAGING_DIR_NATIVE}/usr/lib/libpython*.so + fi } do_install:append() { diff --git a/bb_fix/ros-workspace/fix/DEPENDS b/bb_fix/ros-workspace/fix/DEPENDS index d0a27bcc9ad22cfbac42fc4c6c9b5886420df5e1..b18e69ecffb458666767951e62c30b8cf20576a0 100644 --- a/bb_fix/ros-workspace/fix/DEPENDS +++ b/bb_fix/ros-workspace/fix/DEPENDS @@ -2,3 +2,4 @@ +ament-cmake-core-native -ament-package +ament-package-native ++python3-numpy-native diff --git a/bb_fix/rviz-common/fix/DEPENDS b/bb_fix/rviz-common/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..c2f2c8af9c2a715cf726017b5b10ae64d9f9b42c --- /dev/null +++ b/bb_fix/rviz-common/fix/DEPENDS @@ -0,0 +1 @@ +-qt5-qtbase-native diff --git a/bb_fix/rviz-common/fix/RDEPENDS b/bb_fix/rviz-common/fix/RDEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..eba1c8184c2e7cba503192eeb5655d1ae035b125 --- /dev/null +++ b/bb_fix/rviz-common/fix/RDEPENDS @@ -0,0 +1,2 @@ +-qt5-qtbase +-qt5-qtbase-gui diff --git a/bb_fix/rviz-default-plugins/fix/DEPENDS b/bb_fix/rviz-default-plugins/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..c2f2c8af9c2a715cf726017b5b10ae64d9f9b42c --- /dev/null +++ b/bb_fix/rviz-default-plugins/fix/DEPENDS @@ -0,0 +1 @@ +-qt5-qtbase-native diff --git a/bb_fix/rviz-default-plugins/fix/RDEPENDS b/bb_fix/rviz-default-plugins/fix/RDEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..eba1c8184c2e7cba503192eeb5655d1ae035b125 --- /dev/null +++ b/bb_fix/rviz-default-plugins/fix/RDEPENDS @@ -0,0 +1,2 @@ +-qt5-qtbase +-qt5-qtbase-gui diff --git a/bb_fix/rviz-ogre-vendor/fix/DEPENDS b/bb_fix/rviz-ogre-vendor/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..e1cac75e7a4dfcae5804c1ffcc606cc2034fdb57 --- /dev/null +++ b/bb_fix/rviz-ogre-vendor/fix/DEPENDS @@ -0,0 +1,5 @@ +-libX11-native +-libXaw-native +-libXrandr-native +-mesa-libGL-native +-mesa-libGLU-native diff --git a/bb_fix/rviz-ogre-vendor/fix/RDEPENDS b/bb_fix/rviz-ogre-vendor/fix/RDEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..89bcfe12bfeef5609687b216b5b57d62e7ff95ac --- /dev/null +++ b/bb_fix/rviz-ogre-vendor/fix/RDEPENDS @@ -0,0 +1,5 @@ +-libX11 +-libXaw +-libXrandr +-mesa-libGL +-mesa-libGLU diff --git a/bb_fix/rviz-rendering/fix/DEPENDS b/bb_fix/rviz-rendering/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..24c75f4bdd590c557c39c1b9827cac59e79f1d2a --- /dev/null +++ b/bb_fix/rviz-rendering/fix/DEPENDS @@ -0,0 +1,2 @@ +-minizip-native +-qt5-qtbase-native diff --git a/bb_fix/rviz-rendering/fix/RDEPENDS b/bb_fix/rviz-rendering/fix/RDEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..016bb118ec7b2bf884df30553d143f974e8ca2c3 --- /dev/null +++ b/bb_fix/rviz-rendering/fix/RDEPENDS @@ -0,0 +1,3 @@ +-minizip +-qt5-qtbase +-qt5-qtbase-gui diff --git a/bb_fix/send-goal/files/00-send-goal-fix-compile-error.patch b/bb_fix/send-goal/files/00-send-goal-fix-compile-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..291ac810a1ef611d8b53d0aecd4cd323ee7fe502 --- /dev/null +++ b/bb_fix/send-goal/files/00-send-goal-fix-compile-error.patch @@ -0,0 +1,43 @@ +diff -Naur send_goal_org/src/send_goal_node.cpp send_goal/src/send_goal_node.cpp +--- send_goal_org/src/send_goal_node.cpp 2023-05-28 15:36:09.352895131 +0800 ++++ send_goal/src/send_goal_node.cpp 2023-05-28 15:35:23.335612021 +0800 +@@ -60,9 +60,9 @@ + RCLCPP_INFO(this->get_logger(), "Sending goal"); + + auto send_goal_options = rclcpp_action::Client::SendGoalOptions(); +- send_goal_options.goal_response_callback = std::bind(&GoalCoordinate::goal_response_callback, this, _1); +- send_goal_options.feedback_callback = std::bind(&GoalCoordinate::feedback_callback, this, _1, _2); +- send_goal_options.result_callback = std::bind(&GoalCoordinate::result_callback, this, _1); ++ send_goal_options.goal_response_callback = std::bind(&GoalCoordinate::goal_response_callback, this, std::placeholders::_1); ++ send_goal_options.feedback_callback = std::bind(&GoalCoordinate::feedback_callback, this, std::placeholders::_1, std::placeholders::_2); ++ send_goal_options.result_callback = std::bind(&GoalCoordinate::result_callback, this, std::placeholders::_1); + + this->client_ptr_->async_send_goal(goal_msg, send_goal_options); + } +@@ -71,9 +71,8 @@ + rclcpp_action::Client::SharedPtr client_ptr_; + rclcpp::TimerBase::SharedPtr timer_; + +- void goal_response_callback(std::shared_future future) ++ void goal_response_callback(GoalHandleFibonacci::SharedPtr goal_handle) + { +- auto goal_handle = future.get(); + if (!goal_handle) + { + RCLCPP_ERROR(this->get_logger(), "Goal was rejected by server"); +@@ -89,7 +88,7 @@ + { + auto distance_feedback_msg = std_msgs::msg::String(); + distance_feedback_msg.data = "Remaining Distance from Destination: " + std::to_string(feedback->distance_remaining); +- RCLCPP_INFO(this->get_logger(), distance_feedback_msg.data); ++ RCLCPP_INFO(this->get_logger(), "%s", distance_feedback_msg.data.c_str()); + } + + void result_callback(const GoalHandleFibonacci::WrappedResult &result) +@@ -112,4 +111,4 @@ + } + }; + +-RCLCPP_COMPONENTS_REGISTER_NODE(GoalCoordinate) +\ No newline at end of file ++RCLCPP_COMPONENTS_REGISTER_NODE(GoalCoordinate) diff --git a/bb_fix/send-goal/fix/DEPENDS b/bb_fix/send-goal/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..384d6c747dbddf95eacedf83983de16056897fd4 --- /dev/null +++ b/bb_fix/send-goal/fix/DEPENDS @@ -0,0 +1,4 @@ ++rclcpp ++rclcpp-action ++rclcpp-components ++nav2-msgs diff --git a/bb_fix/shared-queues-vendor/fix/APPENDS b/bb_fix/shared-queues-vendor/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..0ececb9966831bddd9141a844a7c2ff955cbefdc --- /dev/null +++ b/bb_fix/shared-queues-vendor/fix/APPENDS @@ -0,0 +1,4 @@ +do_configure:prepend() { + cp ${OPENEULER_SP_DIR}/${ROS_CN}/8f65a8734d77c3cc00d74c0532efca872931d3ce.zip ${S} + cp ${OPENEULER_SP_DIR}/${ROS_CN}/ef7dfbf553288064347d51b8ac335f1ca489032a.zip ${S} +} diff --git a/bb_fix/slam-toolbox/files/00-slam-toolbox-fix-qt-error.patch b/bb_fix/slam-toolbox/files/00-slam-toolbox-fix-qt-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..373a61c8698533ab33640e77f6ffd5c2316dff0e --- /dev/null +++ b/bb_fix/slam-toolbox/files/00-slam-toolbox-fix-qt-error.patch @@ -0,0 +1,132 @@ +diff -Naur ros-humble-slam-toolbox-2.6.4_org/CMakeLists.txt ros-humble-slam-toolbox-2.6.4/CMakeLists.txt +--- ros-humble-slam-toolbox-2.6.4_org/CMakeLists.txt 2023-05-29 22:44:14.568970036 +0800 ++++ ros-humble-slam-toolbox-2.6.4/CMakeLists.txt 2023-05-29 22:43:45.277795825 +0800 +@@ -25,12 +25,12 @@ + find_package(std_srvs REQUIRED) + find_package(builtin_interfaces REQUIRED) + find_package(rosidl_default_generators REQUIRED) +-find_package(rviz_common REQUIRED) +-find_package(rviz_default_plugins REQUIRED) +-find_package(rviz_ogre_vendor REQUIRED) +-find_package(rviz_rendering REQUIRED) ++#find_package(rviz_common REQUIRED) ++#find_package(rviz_default_plugins REQUIRED) ++#find_package(rviz_ogre_vendor REQUIRED) ++#find_package(rviz_rendering REQUIRED) + find_package(interactive_markers REQUIRED) +-find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets Test Concurrent) ++#find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets Test Concurrent) + + #karto_sdk lib + set(BUILD_SHARED_LIBS ON) +@@ -52,17 +52,17 @@ + std_msgs + std_srvs + builtin_interfaces +- rviz_common +- rviz_default_plugins +- rviz_ogre_vendor +- rviz_rendering ++ # rviz_common ++ # rviz_default_plugins ++ # rviz_ogre_vendor ++ # rviz_rendering + interactive_markers +- Qt5 ++ # Qt5 + ) + + set(libraries + toolbox_common +- SlamToolboxPlugin ++ # SlamToolboxPlugin + ceres_solver_plugin + async_slam_toolbox + sync_slam_toolbox +@@ -88,7 +88,7 @@ + ${CHOLMOD_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} + ${TBB_INCLUDE_DIRS} +- ${CERES_INCLUDES} ++ ${CERES_INCLUDES} + ) + + add_definitions(${EIGEN3_DEFINITIONS}) +@@ -108,23 +108,23 @@ + ) + + #### rviz Plugin +-qt5_wrap_cpp(MOC_FILES rviz_plugin/slam_toolbox_rviz_plugin.hpp) +-add_library(SlamToolboxPlugin SHARED +- rviz_plugin/slam_toolbox_rviz_plugin.cpp +- ${MOC_FILES}) +-ament_target_dependencies(SlamToolboxPlugin +- ${dependencies} +-) +-target_include_directories(SlamToolboxPlugin PUBLIC +- ${Qt5Widgets_INCLUDE_DIRS} +- ${OGRE_INCLUDE_DIRS} +-) +-target_link_libraries(SlamToolboxPlugin ${QT_LIBRARIES} rviz_common::rviz_common) +-rosidl_get_typesupport_target(cpp_typesupport_target ${PROJECT_NAME} "rosidl_typesupport_cpp") +-target_link_libraries(SlamToolboxPlugin "${cpp_typesupport_target}") +-target_compile_definitions(SlamToolboxPlugin PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") +-target_compile_definitions(SlamToolboxPlugin PRIVATE "RVIZ_DEFAULT_PLUGINS_BUILDING_LIBRARY") +-pluginlib_export_plugin_description_file(rviz_common rviz_plugins.xml) ++#qt5_wrap_cpp(MOC_FILES rviz_plugin/slam_toolbox_rviz_plugin.hpp) ++#add_library(SlamToolboxPlugin SHARED ++# rviz_plugin/slam_toolbox_rviz_plugin.cpp ++# ${MOC_FILES}) ++#ament_target_dependencies(SlamToolboxPlugin ++# ${dependencies} ++#) ++#target_include_directories(SlamToolboxPlugin PUBLIC ++# ${Qt5Widgets_INCLUDE_DIRS} ++# ${OGRE_INCLUDE_DIRS} ++#) ++#target_link_libraries(SlamToolboxPlugin ${QT_LIBRARIES} rviz_common::rviz_common) ++#rosidl_get_typesupport_target(cpp_typesupport_target ${PROJECT_NAME} "rosidl_typesupport_cpp") ++#target_link_libraries(SlamToolboxPlugin "${cpp_typesupport_target}") ++#target_compile_definitions(SlamToolboxPlugin PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") ++#target_compile_definitions(SlamToolboxPlugin PRIVATE "RVIZ_DEFAULT_PLUGINS_BUILDING_LIBRARY") ++#pluginlib_export_plugin_description_file(rviz_common rviz_plugins.xml) + + #### Ceres Plugin + add_library(ceres_solver_plugin solvers/ceres_solver.cpp) +@@ -134,6 +134,8 @@ + ${TBB_LIBRARIES} + kartoSlamToolbox + ) ++message("niutao") ++message("$ENV{LINK_PATH}") + rosidl_get_typesupport_target(cpp_typesupport_target ${PROJECT_NAME} "rosidl_typesupport_cpp") + target_link_libraries(ceres_solver_plugin "${cpp_typesupport_target}") + pluginlib_export_plugin_description_file(slam_toolbox solver_plugins.xml) +@@ -199,13 +201,13 @@ + RUNTIME DESTINATION lib/${PROJECT_NAME} + ) + +-install(TARGETS SlamToolboxPlugin +- EXPORT SlamToolboxPlugin +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib +- RUNTIME DESTINATION bin +- INCLUDES DESTINATION include +-) ++#install(TARGETS SlamToolboxPlugin ++# EXPORT SlamToolboxPlugin ++# ARCHIVE DESTINATION lib ++# LIBRARY DESTINATION lib ++# RUNTIME DESTINATION bin ++# INCLUDES DESTINATION include ++#) + + install(DIRECTORY include/ + DESTINATION include +@@ -226,5 +228,5 @@ + ament_export_include_directories(include) + ament_export_libraries(${libraries}) + ament_export_dependencies(${dependencies}) +-ament_export_targets(SlamToolboxPlugin HAS_LIBRARY_TARGET) ++#ament_export_targets(SlamToolboxPlugin HAS_LIBRARY_TARGET) + ament_package() diff --git a/bb_fix/slam-toolbox/fix/DEPENDS b/bb_fix/slam-toolbox/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..e678de4a22c255e3c9ad8a6543498b71110716c8 --- /dev/null +++ b/bb_fix/slam-toolbox/fix/DEPENDS @@ -0,0 +1,16 @@ +-qt5-qtbase-native +-rviz-common-native +-rviz-default-plugins-native +-rviz-ogre-vendor-native +-rviz-rendering-native ++rosidl-adapter-native ++ament-cmake-ros-native ++ament-cmake-gmock-native ++python3-numpy-native ++rosidl-generator-c-native ++rosidl-generator-cpp-native ++rosidl-generator-py-native ++rosidl-typesupport-introspection-cpp-native ++rosidl-typesupport-fastrtps-cpp-native ++rosidl-typesupport-fastrtps-c-native ++rosidl-typesupport-cpp-native diff --git a/bb_fix/slam-toolbox/fix/RDEPENDS b/bb_fix/slam-toolbox/fix/RDEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..367d688344930a0c2250c174324559b30a2eb3ea --- /dev/null +++ b/bb_fix/slam-toolbox/fix/RDEPENDS @@ -0,0 +1,6 @@ +-qt5-qtbase +-qt5-qtbase-gui +-rviz-common +-rviz-default-plugins +-rviz-ogre-vendor +-rviz-rendering diff --git a/bb_fix/suitesparse/fix/APPENDS b/bb_fix/suitesparse/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..31d41abf17dddbb4976e9d003af1571b173e7705 --- /dev/null +++ b/bb_fix/suitesparse/fix/APPENDS @@ -0,0 +1,159 @@ +do_configure() { + for fil in $(grep -Frl 'pragma ivdep' .); do + sed -i.orig 's/pragma ivdep/pragma GCC ivdep/' $fil + touch -r ${fil}.orig $fil + rm -f ${fil}.orig + done + +} +do_compile() { + cd ${S} + export AUTOCC=no + install -d Doc/{AMD,BTF,CAMD,CCOLAMD,CHOLMOD,COLAMD,KLU,LDL,UMFPACK,SPQR,RBio} Lib Include + export BLAS="-lblas" + export LAPACK="-llapack" + pushd SuiteSparse_config + make CFLAGS="$CFLAGS" BLAS="$BLAS" + mkdir -p Lib + ar x libsuitesparseconfig.a + cp libsuitesparseconfig.a Lib + cp -a *.a ../lib + cp -p *.h ../Include + popd + + pushd AMD + pushd Lib + make CFLAGS="$CFLAGS" BLAS="$BLAS" + popd + cp -p Include/*.h ../Include + cp -p README.txt Doc/License.txt Doc/lesser.txt Doc/ChangeLog Doc/*.pdf ../Doc/AMD + popd + + pushd BTF + pushd Lib + make CFLAGS="$CFLAGS" BLAS="$BLAS" + popd + cp -p Include/*.h ../Include + cp -p README.txt Doc/* ../Doc/BTF + popd + + pushd CAMD + pushd Lib + make CFLAGS="$CFLAGS" BLAS="$BLAS" + popd + cp -p Include/*.h ../Include + cp -p README.txt Doc/ChangeLog Doc/License.txt Doc/*.pdf ../Doc/CAMD + popd + + pushd CCOLAMD + pushd Lib + make CFLAGS="$CFLAGS" BLAS="$BLAS" + popd + cp -p Include/*.h ../Include + cp -p README.txt Doc/* ../Doc/CCOLAMD + popd + + pushd COLAMD + pushd Lib + make CFLAGS="$CFLAGS" BLAS="$BLAS" + popd + cp -p Include/*.h ../Include + cp -p README.txt Doc/* ../Doc/COLAMD + popd + + pushd CHOLMOD + pushd Lib + make CFLAGS="$CFLAGS" LAPACK="$LAPACK" BLAS="$BLAS" + popd + cp -p Include/*.h ../Include + cp -p README.txt Doc/*.pdf ../Doc/CHOLMOD + cp -p Cholesky/lesser.txt ../Doc/CHOLMOD/Cholesky_License.txt + cp -p Core/lesser.txt ../Doc/CHOLMOD/Core_License.txt + cp -p MatrixOps/gpl.txt ../Doc/CHOLMOD/MatrixOps_License.txt + cp -p Partition/lesser.txt ../Doc/CHOLMOD/Partition_License.txt + cp -p Supernodal/gpl.txt ../Doc/CHOLMOD/Supernodal_License.txt + popd + + pushd CXSparse + pushd Lib + make CFLAGS="$CFLAGS" BLAS="$BLAS" + popd + cp -p Include/cs.h ../Include + mkdir -p ../Doc/CXSparse/ + cp -p Doc/* ../Doc/CXSparse + popd + + pushd KLU + pushd Lib + make CFLAGS="$CFLAGS" BLAS="$BLAS" + popd + cp -p Include/*.h ../Include + cp -p README.txt Doc/lesser.txt ../Doc/KLU + popd + + pushd LDL + pushd Lib + make CFLAGS="$CFLAGS" BLAS="$BLAS" + popd + cp -p Include/*.h ../Include + cp -p README.txt Doc/ChangeLog Doc/lesser.txt Doc/*.pdf ../Doc/LDL + popd + + pushd UMFPACK + pushd Lib + make CFLAGS="$CFLAGS" BLAS="$BLAS" + popd + cp -p Include/*.h ../Include + cp -p README.txt Doc/License.txt Doc/ChangeLog Doc/gpl.txt Doc/*.pdf ../Doc/UMFPACK + popd + + pushd SPQR + pushd Lib + make CFLAGS="$CFLAGS -DHAVE_TBB -DNPARTITION" TBB=-ltbb BLAS="$BLAS" + popd + cp -p Include/*.h* ../Include + cp -p README{,_SPQR}.txt + cp -p README_SPQR.txt Doc/* ../Doc/SPQR + popd + + pushd RBio + pushd Lib + make CFLAGS="$CFLAGS" BLAS="$BLAS" + popd + cp -p Include/*.h ../Include + cp -p README.txt Doc/ChangeLog Doc/License.txt ../Doc/RBio + popd + +} + +do_install() { + cd ${S} + install -d ${D}/${libdir} + install -d ${D}/${includedir}/${PN} + install -d ${D}/${datadir}/doc + install -m 0644 Include/*.{h,hpp} ${D}/${includedir}/${PN} + install -m 0755 */Lib/*.a lib/*.so* ${D}/${libdir} + rm -rf Licenses + mkdir Licenses + find */ -iname lesser.txt -o -iname lesserv3.txt -o -iname license.txt -o \ + -iname gpl.txt -o -iname GPLv2.txt -o -iname license \ + -a -not -type d | while read f; do + b="${f%%/*}" + r="${f#$b}" + x="$(echo "$r" | sed 's|/doc/|/|gi')" + install -m0644 -D "$f" "./Licenses/$b/$x" + done + find Licenses -type f -exec install -Dm 0644 "{}" "${D}/${datadir}/doc/${PN}/{}" \; + + file `find ${D}/${libdir} -type f` | grep -w ELF |awk -F: '{print $1}' | xargs chrpath -d +} + +FILES:${PN}-dev:remove = " \ + ${libdir}/lib*.so \ +" + +FILES:${PN} += " \ + ${libdir}/lib*.so \ +" + +INSANE_SKIP:${PN} += "dev-so" diff --git a/bb_fix/suitesparse/fix/DEPENDS b/bb_fix/suitesparse/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..f9789f4500ad04a03406aec0adfef80e7a54f105 --- /dev/null +++ b/bb_fix/suitesparse/fix/DEPENDS @@ -0,0 +1,9 @@ +-hardlink-native +-lapack-native +-metis-native +-openblas-native +-tbb-native ++lapack ++openblas ++tbb + diff --git a/bb_fix/suitesparse/fix/RDEPENDS b/bb_fix/suitesparse/fix/RDEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..36cbd6ff484ca7fbecfad94db8d3402d3fe682ec --- /dev/null +++ b/bb_fix/suitesparse/fix/RDEPENDS @@ -0,0 +1 @@ ++metis diff --git a/bb_fix/tf2-ros/files/00-tf2-ros-fix-link-error.patch b/bb_fix/tf2-ros/files/00-tf2-ros-fix-link-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..b67dcf324c08a579a01412a08542e0fd81e3e772 --- /dev/null +++ b/bb_fix/tf2-ros/files/00-tf2-ros-fix-link-error.patch @@ -0,0 +1,11 @@ +diff -Naur ros-humble-tf2-ros-0.25.2_org/CMakeLists.txt ros-humble-tf2-ros-0.25.2/CMakeLists.txt +--- ros-humble-tf2-ros-0.25.2_org/CMakeLists.txt 2023-05-26 12:50:14.723683220 +0800 ++++ ros-humble-tf2-ros-0.25.2/CMakeLists.txt 2023-05-26 12:50:39.504828059 +0800 +@@ -76,6 +76,7 @@ + rclcpp::rclcpp + static_transform_broadcaster_node + tf2::tf2 ++ class_loader::class_loader + ) + + add_executable(tf2_echo diff --git a/bb_fix/tinyxml/fix/APPENDS b/bb_fix/tinyxml/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..fd4a2f60609bd146048b69075b4c01bdc77502d3 --- /dev/null +++ b/bb_fix/tinyxml/fix/APPENDS @@ -0,0 +1,17 @@ +do_configure() { +} + +do_compile() { + ${CXX} -fPIC -o tinyxml.cpp.o -c ${S}/tinyxml.cpp + ${CXX} -fPIC -o tinystr.cpp.o -c ${S}/tinystr.cpp + ${CXX} -fPIC -o tinyxmlerror.cpp.o -c ${S}/tinyxmlerror.cpp + ${CXX} -fPIC -o tinyxmlparser.cpp.o -c ${S}/tinyxmlparser.cpp + ${CXX} -shared -o libtinyxml.so.0.${PV} -Wl,-soname,libtinyxml.so.0 *.cpp.o + ln -s libtinyxml.so.0.${PV} libtinyxml.so.0 +} + +do_install() { + mkdir -p ${D}/${includedir} ${D}/${libdir} + cp ${S}/tinyxml.h ${D}/${includedir}/ + cp ${B}/libtinyxml.so* ${D}/${libdir}/ +} diff --git a/bb_fix/yaml-cpp/fix/APPENDS b/bb_fix/yaml-cpp/fix/APPENDS index f8b40f539bcfa15d7e3920e64fabbe0679b73b07..4d2cbd697353952f56908633f894fe2037b65394 100644 --- a/bb_fix/yaml-cpp/fix/APPENDS +++ b/bb_fix/yaml-cpp/fix/APPENDS @@ -1 +1 @@ -EXTRA_OECMAKE += "-DYAML_CPP_BUILD_TESTS=OFF -DYAML_CPP_BUILD_TOOLS=OFF" +EXTRA_OECMAKE += " -DYAML_BUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TESTS=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_BUILD_CONTRIB=OFF" diff --git a/bb_fix/ydlidar-ros2-driver/files/00-ydlidar-ros2-driver-fix-error.patch b/bb_fix/ydlidar-ros2-driver/files/00-ydlidar-ros2-driver-fix-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..d1ab65d3346a8525d864e9957746349db5df4913 --- /dev/null +++ b/bb_fix/ydlidar-ros2-driver/files/00-ydlidar-ros2-driver-fix-error.patch @@ -0,0 +1,137 @@ +diff -Naur ydlidar_ros2_driver_org/src/ydlidar_ros2_driver_node.cpp ydlidar_ros2_driver/src/ydlidar_ros2_driver_node.cpp +--- ydlidar_ros2_driver_org/src/ydlidar_ros2_driver_node.cpp 2023-05-30 11:30:17.993357651 +0800 ++++ ydlidar_ros2_driver/src/ydlidar_ros2_driver_node.cpp 2023-05-30 11:41:13.529049903 +0800 +@@ -41,45 +41,45 @@ + + CYdLidar laser; + std::string str_optvalue = "/dev/ydlidar"; +- node->declare_parameter("port"); ++ node->declare_parameter("port"); + node->get_parameter("port", str_optvalue); + ///lidar port + laser.setlidaropt(LidarPropSerialPort, str_optvalue.c_str(), str_optvalue.size()); + + ///ignore array + str_optvalue = ""; +- node->declare_parameter("ignore_array"); ++ node->declare_parameter("ignore_array"); + node->get_parameter("ignore_array", str_optvalue); + laser.setlidaropt(LidarPropIgnoreArray, str_optvalue.c_str(), str_optvalue.size()); + + std::string frame_id = "laser_frame"; +- node->declare_parameter("frame_id"); ++ node->declare_parameter("frame_id"); + node->get_parameter("frame_id", frame_id); + + //////////////////////int property///////////////// + /// lidar baudrate + int optval = 115200; +- node->declare_parameter("baudrate"); ++ node->declare_parameter("baudrate"); + node->get_parameter("baudrate", optval); + laser.setlidaropt(LidarPropSerialBaudrate, &optval, sizeof(int)); + /// tof lidar + optval = TYPE_TRIANGLE; +- node->declare_parameter("lidar_type"); ++ node->declare_parameter("lidar_type"); + node->get_parameter("lidar_type", optval); + laser.setlidaropt(LidarPropLidarType, &optval, sizeof(int)); + /// device type + optval = YDLIDAR_TYPE_SERIAL; +- node->declare_parameter("device_type"); ++ node->declare_parameter("device_type"); + node->get_parameter("device_type", optval); + laser.setlidaropt(LidarPropDeviceType, &optval, sizeof(int)); + /// sample rate + optval = 9; +- node->declare_parameter("sample_rate"); ++ node->declare_parameter("sample_rate"); + node->get_parameter("sample_rate", optval); + laser.setlidaropt(LidarPropSampleRate, &optval, sizeof(int)); + /// abnormal count + optval = 4; +- node->declare_parameter("abnormal_check_count"); ++ node->declare_parameter("abnormal_check_count"); + node->get_parameter("abnormal_check_count", optval); + laser.setlidaropt(LidarPropAbnormalCheckCount, &optval, sizeof(int)); + +@@ -87,66 +87,66 @@ + //////////////////////bool property///////////////// + /// fixed angle resolution + bool b_optvalue = false; +- node->declare_parameter("fixed_resolution"); ++ node->declare_parameter("fixed_resolution"); + node->get_parameter("fixed_resolution", b_optvalue); + laser.setlidaropt(LidarPropFixedResolution, &b_optvalue, sizeof(bool)); + /// rotate 180 + b_optvalue = true; +- node->declare_parameter("reversion"); ++ node->declare_parameter("reversion"); + node->get_parameter("reversion", b_optvalue); + laser.setlidaropt(LidarPropReversion, &b_optvalue, sizeof(bool)); + /// Counterclockwise + b_optvalue = true; +- node->declare_parameter("inverted"); ++ node->declare_parameter("inverted"); + node->get_parameter("inverted", b_optvalue); + laser.setlidaropt(LidarPropInverted, &b_optvalue, sizeof(bool)); + b_optvalue = true; +- node->declare_parameter("auto_reconnect"); ++ node->declare_parameter("auto_reconnect"); + node->get_parameter("auto_reconnect", b_optvalue); + laser.setlidaropt(LidarPropAutoReconnect, &b_optvalue, sizeof(bool)); + /// one-way communication + b_optvalue = true; +- node->declare_parameter("isSingleChannel"); ++ node->declare_parameter("isSingleChannel"); + node->get_parameter("isSingleChannel", b_optvalue); + laser.setlidaropt(LidarPropSingleChannel, &b_optvalue, sizeof(bool)); + /// intensity + b_optvalue = false; +- node->declare_parameter("intensity"); ++ node->declare_parameter("intensity"); + node->get_parameter("intensity", b_optvalue); + laser.setlidaropt(LidarPropIntenstiy, &b_optvalue, sizeof(bool)); + /// Motor DTR + b_optvalue = false; +- node->declare_parameter("support_motor_dtr"); ++ node->declare_parameter("support_motor_dtr"); + node->get_parameter("support_motor_dtr", b_optvalue); + laser.setlidaropt(LidarPropSupportMotorDtrCtrl, &b_optvalue, sizeof(bool)); + + //////////////////////float property///////////////// + /// unit: ° + float f_optvalue = 180.0f; +- node->declare_parameter("angle_max"); ++ node->declare_parameter("angle_max"); + node->get_parameter("angle_max", f_optvalue); + laser.setlidaropt(LidarPropMaxAngle, &f_optvalue, sizeof(float)); + f_optvalue = -180.0f; +- node->declare_parameter("angle_min"); ++ node->declare_parameter("angle_min"); + node->get_parameter("angle_min", f_optvalue); + laser.setlidaropt(LidarPropMinAngle, &f_optvalue, sizeof(float)); + /// unit: m + f_optvalue = 64.f; +- node->declare_parameter("range_max"); ++ node->declare_parameter("range_max"); + node->get_parameter("range_max", f_optvalue); + laser.setlidaropt(LidarPropMaxRange, &f_optvalue, sizeof(float)); + f_optvalue = 0.1f; +- node->declare_parameter("range_min"); ++ node->declare_parameter("range_min"); + node->get_parameter("range_min", f_optvalue); + laser.setlidaropt(LidarPropMinRange, &f_optvalue, sizeof(float)); + /// unit: Hz + f_optvalue = 10.f; +- node->declare_parameter("frequency"); ++ node->declare_parameter("frequency"); + node->get_parameter("frequency", f_optvalue); + laser.setlidaropt(LidarPropScanFrequency, &f_optvalue, sizeof(float)); + + bool invalid_range_is_inf = false; +- node->declare_parameter("invalid_range_is_inf"); ++ node->declare_parameter("invalid_range_is_inf"); + node->get_parameter("invalid_range_is_inf", invalid_range_is_inf); + + diff --git a/bb_fix/ydlidar-ros2-driver/fix/DEPENDS b/bb_fix/ydlidar-ros2-driver/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..032ca1719c821b7bfaced47a1b9946473cf16597 --- /dev/null +++ b/bb_fix/ydlidar-ros2-driver/fix/DEPENDS @@ -0,0 +1 @@ ++ydlidar-sdk diff --git a/bb_fix/ydlidar-sdk/files/00-ydlidar-sdk-fix-pkgconfig.patch b/bb_fix/ydlidar-sdk/files/00-ydlidar-sdk-fix-pkgconfig.patch new file mode 100644 index 0000000000000000000000000000000000000000..a37c1349702702f812fc78955038102bd0fc9c54 --- /dev/null +++ b/bb_fix/ydlidar-sdk/files/00-ydlidar-sdk-fix-pkgconfig.patch @@ -0,0 +1,10 @@ +--- YDLidar-SDK-1.1.3/cmake/PkgConfig.pc.in_org 2023-05-30 08:56:29.247211407 +0800 ++++ YDLidar-SDK-1.1.3/cmake/PkgConfig.pc.in 2023-05-30 08:56:37.776265216 +0800 +@@ -6,6 +6,6 @@ + Name: @PACKAGE_PKG_NAME@ + Description: @PACKAGE_DESCRIPTION@ + Version: @PACKAGE_VERSION@ +-Cflags: @PACKAGE_CFLAGS@ ++Cflags: + Libs: -L${libdir} @PACKAGE_LIBS@ @PACKAGE_LIB_LINK@ + diff --git a/bb_fix/ydlidar-sdk/fix/APPENDS b/bb_fix/ydlidar-sdk/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..07124b22db84e2633aa8c3ad00bedeea6b1f6ff1 --- /dev/null +++ b/bb_fix/ydlidar-sdk/fix/APPENDS @@ -0,0 +1,17 @@ +FILES:${PN}-dev:remove = " \ + ${libdir}/lib*.so \ +" + +FILES:${PN} += " \ + ${prefix}/startup \ + ${libdir}/lib*.so \ +" +FILES:${PN}-doc += " \ + ${datadir}/YDLIDAR_SDK/doc \ +" +FILES:${PN}-dev += " \ + ${datadir}/YDLIDAR_SDK/*.* \ + ${datadir}/YDLIDAR_SDK/common \ +" + +EXTRA_OECMAKE += " -DBUILD_TEST=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=${prefix} -DCMAKE_INSTALL_LIBDIR=${libdir}" diff --git a/bb_fix/ydlidar-sdk/fix/DEPENDS b/bb_fix/ydlidar-sdk/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..f33c361735510241f1ff2da8291cba8891c2cb40 --- /dev/null +++ b/bb_fix/ydlidar-sdk/fix/DEPENDS @@ -0,0 +1,6 @@ +-gtest-native +-python3-native +-swig-native ++gtest ++python3 ++swig diff --git a/bb_fix/zeromq/fix/APPENDS b/bb_fix/zeromq/fix/APPENDS new file mode 100644 index 0000000000000000000000000000000000000000..bd72cf3177e877f0d38a14a28bbfe6e5951de994 --- /dev/null +++ b/bb_fix/zeromq/fix/APPENDS @@ -0,0 +1,3 @@ +FILES:${PN}-dev += " \ + ${datadir}/zmq \ +" diff --git a/bb_fix/zeromq/fix/DEPENDS b/bb_fix/zeromq/fix/DEPENDS new file mode 100644 index 0000000000000000000000000000000000000000..2274d48bac5efc11090236d4d9cc365cd0644ef6 --- /dev/null +++ b/bb_fix/zeromq/fix/DEPENDS @@ -0,0 +1,8 @@ +-asciidoc-native +-openpgm-native +-xmlto-native +-krb5-native +-libsodium-native +-libunwind-native ++libsodium ++libunwind diff --git a/gen-pkg-bb.sh b/gen-pkg-bb.sh index 26584fd8a58992ed2e2e07e813596669ffcfc2ba..5144275d641e1b00fc90ef342aaddc0255004039 100755 --- a/gen-pkg-bb.sh +++ b/gen-pkg-bb.sh @@ -10,9 +10,6 @@ ROS_PKG_SRC=${OUTPUT}/ros-pkg-src.list ROS_PACKAGE_FIX=${ROOT}/package_fix ROS_PKG_REMAP=${ROOT}/spec_fix/pkg.remap ROS_GENERAGTED_BB_BASE=${ROS_BB_BASE}/recipes-generated -ROS_NATIVE_PKGS=${ROS_GENERAGTED_BB_BASE}/ros-native-pkgs.inc -ROS_NATIVE_PKGS_TMP1=${ROS_BB_BASE}/.ros-native-pkgs.tmp1 -ROS_NATIVE_PKGS_TMP2=${ROS_BB_BASE}/.ros-native-pkgs.tmp2 prepare() { @@ -37,11 +34,8 @@ prepare() if [ "$GEN_ONE" == "" ] then rm -rf ${ROS_GENERAGTED_BB_BASE} - rm -f ${ROS_NATIVE_PKGS} - rm -f ${ROS_NATIVE_PKGS_TMP2} fi - rm -f ${ROS_NATIVE_PKGS_TMP1} mkdir -p ${ROS_GENERAGTED_BB_BASE} } @@ -96,9 +90,25 @@ gen_src_url() { pkg=$1 bbfile=$2 + git_url=$3 + tree=$4 + path=$5 + + if [ "$SRC_TAR_FROM" != "ubuntu" ] + then + echo "OPENEULER_GIT_URL = \"$git_url\"" >> $bbfile + echo "OPENEULER_BRANCH = \"${tree}\"" >> $bbfile + echo "S = \"\${WORKDIR}/${path}\"" >> $bbfile + fi echo "SRC_URI = \" \\" >> $bbfile - echo " file://\${OPENEULER_LOCAL_NAME}/ros-\${ROS_DISTRO}-\${ROS_SPN}_\${PV}.orig.tar.gz \\" >> $bbfile + if [ "$SRC_TAR_FROM" == "ubuntu" ] + then + echo " file://\${OPENEULER_LOCAL_NAME}/ros-\${ROS_DISTRO}-\${ROS_SPN}_\${PV}.orig.tar.gz \\" >> $bbfile + else + echo " file://${path} \\" >> $bbfile + fi + if [ -d ${ROS_PACKAGE_FIX}/${pkg} ] then for tarball in `cd ${ROS_PACKAGE_FIX}/${pkg} && ls | grep -v "\.fix" | grep -v "\.patch"` @@ -165,6 +175,7 @@ rename_depend() for dep in `cat $require_file` do map=`grep "^${dep} " ${BB_FIX_PKG_REMAP}` + #echo $dep $map [ "$map" == "" ] && continue bb_pkg=`echo $map | cut -d' ' -f2` @@ -244,6 +255,12 @@ gen_each_depend() else cat ${package_xml_deps} | sed -e "s#^${spec_deps_suffix}: ##g" > ${require_file} fi + + if [ "$SRC_TAR_FROM" != "ubuntu" ] + then + sed -i "s#_#-#g" ${require_file} + sed -i "s#ros-distro#ros_distro#g" ${require_file} + fi fi spec_fix $pkg $spec_deps_suffix $require_file @@ -271,7 +288,6 @@ gen_each_depend() then bb_fix $pkg ${OUTPUT}/.temp${fix_bb_deps} $fix_bb_deps cat ${OUTPUT}/.temp${fix_bb_deps} | sort | uniq | sed -e 's#$# \\#g' -e 's#^# #g' >> $bbfile - cat ${OUTPUT}/.temp${fix_bb_deps} >> ${ROS_NATIVE_PKGS_TMP1} return fi @@ -286,7 +302,6 @@ gen_each_depend() echo "$i" >> ${OUTPUT}/.temp${fix_bb_deps} else echo "${i}-native" >> ${OUTPUT}/.temp${fix_bb_deps} - echo "$i" >> ${ROS_NATIVE_PKGS_TMP1} fi done cat ${OUTPUT}/.tempRDEPENDS >> ${OUTPUT}/.temp${fix_bb_deps} @@ -352,25 +367,6 @@ gen_build_type() echo 'inherit ros_${ROS_BUILD_TYPE}' >> $bbfile } -gen_native_pkgs() -{ - [ -f ${ROS_NATIVE_PKGS_TMP1} ] && cat ${ROS_NATIVE_PKGS_TMP1} >> ${ROS_NATIVE_PKGS_TMP2} - - if [ -f ${ROS_NATIVE_PKGS_TMP2} ] - then - cat ${ROS_NATIVE_PKGS_TMP2} | sort | uniq >${ROS_NATIVE_PKGS_TMP1} - mv ${ROS_NATIVE_PKGS_TMP1} ${ROS_NATIVE_PKGS_TMP2} - fi - - echo "# Generated by ros-porting-tools -- DO NOT EDIT" > ${ROS_NATIVE_PKGS} - echo "# Copyright Huawei Technologies Co., Ltd." >> ${ROS_NATIVE_PKGS} - echo "" >> ${ROS_NATIVE_PKGS} - - echo "ROS_NATIVE_PKGS = \"\\" >> ${ROS_NATIVE_PKGS} - cat ${ROS_NATIVE_PKGS_TMP2} | sed -e 's#$#-native \\#g' -e 's#^# #g' >> ${ROS_NATIVE_PKGS} - echo "\"" >> ${ROS_NATIVE_PKGS} -} - main() { prepare @@ -387,7 +383,7 @@ main() grep -P "\t$repo\t" ${ROS_PKG_SRC} >${OUTPUT}/.repo_pkgs grep -P "\t$repo/" ${ROS_PKG_SRC} >>${OUTPUT}/.repo_pkgs - while read pkg path version + while read pkg path version git_url tree do if [ "$GEN_ONE" != "" -a "$pkg" != "$GEN_ONE" ] then @@ -405,7 +401,12 @@ main() base_version=`echo $version | awk -F"-" '{print $1}'` release_version=`echo $version | awk -F"-" '{print $2}'` - pkg_dir_name=`cd ${ROS_SRC_BASE}/${repo} && ls ros-${ROS_DISTRO}-${pkg}_*.orig.tar.gz | sed -e "s#.orig.tar.gz##g" | sed -e "s#_#-#g"` + if [ "$SRC_TAR_FROM" == "ubuntu" ] + then + pkg_dir_name=`cd ${ROS_SRC_BASE}/${repo} && ls ros-${ROS_DISTRO}-${pkg}_*.orig.tar.gz | sed -e "s#.orig.tar.gz##g" | sed -e "s#_#-#g"` + else + pkg_dir_name=`echo $path | sed -e "s#${repo}/##g"` + fi mkdir -p ${ROS_GENERAGTED_BB_BASE}/${repo}/${pkg} @@ -430,7 +431,6 @@ main() echo "" >> $bbfile echo "inherit ros-distro-${ROS_DISTRO}" >> $bbfile - echo "inherit ros-native-pkgs" >> $bbfile echo "" >> $bbfile gen_description $pkg $bbfile @@ -444,15 +444,13 @@ main() echo "" >> $bbfile gen_license $pkg ${ROS_SRC_BASE}/${repo}/${pkg_dir_name} $bbfile - gen_src_url $pkg $bbfile + gen_src_url $pkg $bbfile $git_url $tree $path gen_depends $pkg $bbfile gen_appends $pkg $bbfile gen_build_type ${ROS_SRC_BASE}/${repo}/${pkg_dir_name} $bbfile done < ${OUTPUT}/.repo_pkgs done - gen_native_pkgs - info_log "Gen bb files done, you can find it in ${ROS_GENERAGTED_BB_BASE}" } diff --git a/gen-pkg-ext-bb.sh b/gen-pkg-ext-bb.sh index c3432335a456607d90402625228239b9358be9d3..3491842707249f4446e95ab2c5b88c368fc84d7c 100755 --- a/gen-pkg-ext-bb.sh +++ b/gen-pkg-ext-bb.sh @@ -37,7 +37,13 @@ gen_single_line_config() prefix=$3 config_key=$4 - ret=`grep -i "^${prefix}" $spec | head -1 | awk -F"${prefix}" '{print $2}' | awk '$1=$1'` + prefix_org=`grep -i "^${prefix}" $spec | head -1 | cut -d':' -f1` + if [ "$prefix_org" == "" ] + then + error_log "${config_key} is null." + fi + + ret=`grep -i "^${prefix_org}:" $spec | head -1 | awk -F"${prefix_org}:" '{print $2}' | awk '$1=$1'` if [ "$ret" == "" ] then error_log "${config_key} is null." @@ -55,9 +61,10 @@ gen_src_uri() echo "SRC_URI = \" \\" >> $bbfile echo " file://\${OPENEULER_LOCAL_NAME}/${src_name} \\" >> $bbfile - for patch in `grep "^Patch.*: " $spec | awk '{print $2}'` + for patch in `grep "^Patch.*:" $spec | awk '{print $2}'` do - echo " file://\${OPENEULER_LOCAL_NAME}/${patch} \\" >> $bbfile + fix_patch=`echo $patch | sed -e "s#%{name}#$pkg#g"` + echo " file://\${OPENEULER_LOCAL_NAME}/${fix_patch} \\" >> $bbfile done other_cfg=`ls ${BB_FIX}/$pkg 2>/dev/null | grep -v fix` @@ -164,7 +171,7 @@ gen_each_depend() require_file=${OUTPUT}/.tempDepends >$require_file - for dep in `grep "^${spec_deps}:" $spec | awk -F":" '{print $2}' | awk -F">=" '{print $1}' | grep -v " = "` + for dep in `grep "^${spec_deps}:" $spec | awk -F":" '{print $2}' | awk -F">=" '{print $1}' | grep -v " = " | sed -e "s#,##g"` do echo $dep >>$require_file done @@ -339,6 +346,8 @@ main() echo "BBCLASSEXTEND = \"native\"" >> $bbfile fi + [ "$package_type" == "cmake" ] && echo "SSTATE_SCAN_FILES:append = \" *.cmake\"" >> $bbfile + #gen_files $bbfile done < ${SPEC_TO_BB_LIST} diff --git a/get-pkg-src.sh b/get-pkg-src.sh index acd0a3f956a9b23b4db55d16dbe4671a03a1498e..ae30ec5029359fd6f953e8ba9fe04d9843668df1 100755 --- a/get-pkg-src.sh +++ b/get-pkg-src.sh @@ -55,7 +55,7 @@ main() info_log "Start to analyse ros-pkg." - while read pkg base_path version + while read pkg base_path version git_url tree do if [ "$pkg" = "" -o "$base_path" = "" ] then @@ -77,7 +77,7 @@ main() then error_log "Can not find src path for package $pkg" fi - echo -e "$pkg\t$pkg_src_path\t$version-1" >> ${ROS_PKG_SRC} + echo -e "$pkg\t$pkg_src_path\t$version-1\t$git_url\t$tree" >> ${ROS_PKG_SRC} else pkg_org_name=`echo $pkg | sed "s/-/_/g"` pkg_src_path="" @@ -101,7 +101,7 @@ main() then error_log "Can not find src path for package $pkg" fi - echo -e "$pkg\t$pkg_src_path\t$version" >> ${ROS_PKG_SRC} + echo -e "$pkg\t$pkg_src_path\t$version\t$git_url\t$tree" >> ${ROS_PKG_SRC} fi done < ${ROS_PKG_LIST} diff --git a/get-repo-list.sh b/get-repo-list.sh index dc34e8475c4550e89c831f4fc5dbaf1f1ad10b25..56774a54b566c4cee9ed2d6da9f479753e4060f3 100755 --- a/get-repo-list.sh +++ b/get-repo-list.sh @@ -95,6 +95,23 @@ main() fi fi + echo $url | grep -q "^https://gitee.com" + if [ "$?" -eq 0 ] + then + echo $url | grep -q ".git$" + if [ "$?" -eq 0 ] + then + project_name=`echo $url | awk 'BEGIN {FS="\\\.git"} {print $1}' | awk -F"/" '{print $NF}'` + tree=master + new_url=$url + else + project_name=`echo $url | awk -F"/tree/" '{print $1}' | awk -F"/" '{print $NF}'` + tree=`echo $url | awk -F"/tree/" '{print $2}'` + new_url=`echo $url | awk -F"/tree/" '{print $1}'`.git + git_url=`echo $new_url | sed -e "s#/${project_name}.git##g"` + fi + fi + echo $url | grep -q "^https://bitbucket.org" if [ "$?" -eq 0 ] then @@ -113,7 +130,10 @@ main() exit 1 fi - echo -e "$pkg\t$project_name\t$version" >> ${ROS_PKG_LIST} + [ "$git_url" == "" ] && git_url="None" + [ "$tree" == "" ] && tree="None" + + echo -e "$pkg\t$project_name\t$version\t$git_url\t$tree" >> ${ROS_PKG_LIST} grep -Fq "$new_url" ${ROS_REPOS_URL} if [ $? -eq 0 ] diff --git a/humble/ros-projects-third.list b/humble/ros-projects-third.list new file mode 100644 index 0000000000000000000000000000000000000000..59146ac2a027ab00d362a9accc19e0d38302a8d0 --- /dev/null +++ b/humble/ros-projects-third.list @@ -0,0 +1,16 @@ +originbot-base https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +originbot-bringup https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +originbot-demo https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +originbot-linefollower https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +originbot-msgs https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +originbot-navigation https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +body-tracking https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +gesture-control https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +line-follower-perception https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +parking-search https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +play-football https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +originbot-autonomous https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +originbot-teleop https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +serial https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +ydlidar-ros2-driver https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 +send-goal https://gitee.com/guyuehome/originbot/tree/v1.0.2 maintained 1.0.2-1 diff --git a/humble/spec_to_bb.list b/humble/spec_to_bb.list index 63f25de7974467fd89202a84fbedf0f304077cff..5fe6fba68ae3dc0841e3e932b9269751f89bd387 100644 --- a/humble/spec_to_bb.list +++ b/humble/spec_to_bb.list @@ -21,4 +21,17 @@ python3-catkin-sphinx python yes python3-catkin-sphinx https://gitee.com/will_ni cppcheck cmake yes cppcheck https://gitee.com/src-openeuler/cppcheck/raw/openEuler-22.03-LTS-SP1/cppcheck.spec 2.6.3.tar.gz cppcheck-2.6.3 python3-pydocstyle python yes python3-pydocstyle https://gitee.com/src-openeuler/python-pydocstyle/raw/openEuler-22.03-LTS-SP1/python-pydocstyle.spec 6.1.1.tar.gz pydocstyle-6.1.1 #acl cmake yes acl https://gitee.com/src-openeuler/acl/raw/openEuler-22.03-LTS-SP1/acl.spec acl-2.3.1.tar.gz acl-2.3.1 -eigen3 cmake yes eigen3 https://gitee.com/will_niutao/eigen/raw/master/eigen3.spec eigen-3.3.8.tar.bz2 eigen-3.3.8 +#eigen3 cmake no eigen3 https://gitee.com/will_niutao/eigen/raw/master/eigen3.spec eigen-3.3.8.tar.bz2 eigen-3.3.8 +pcl cmake no pcl https://gitee.com/will_niutao/pcl/raw/master/pcl.spec pcl-1.12.1.tar.gz pcl-pcl-1.12.1 +flann cmake no flann https://gitee.com/will_niutao/flann/raw/master/flann.spec 1.9.2.tar.gz flann-1.9.2 +qhull cmake no qhull https://gitee.com/src-openeuler/qhull/raw/openEuler-22.03-LTS-SP1/qhull.spec qhull-2015-src-7.2.0.tgz qhull-2015.2 +tinyxml cmake no tinyxml https://gitee.com/src-openeuler/tinyxml/raw/openEuler-22.03-LTS-SP2/tinyxml.spec tinyxml_2_6_2.tar.gz tinyxml +orocos-kdl cmake no orocos-kdl https://gitee.com/src-openeuler/orocos_kdl/raw/master/orocos-kdl.spec v1.5.1.tar.gz orocos_kinematics_dynamics-1.5.1 +graphicsmagick cmake no graphicsmagick https://gitee.com/src-openeuler/GraphicsMagick/raw/openEuler-22.03-LTS-SP1/GraphicsMagick.spec GraphicsMagick-1.3.30.tar.xz GraphicsMagick-1.3.30 +cppzmq cmake no cppzmq https://gitee.com/will_niutao/cppzmq/raw/master/cppzmq.spec v4.9.0.tar.gz cppzmq-4.9.0 +zeromq cmake no zeromq https://gitee.com/src-openeuler/zeromq/raw/openEuler-22.03-LTS-SP1/zeromq.spec libzmq-4.3.4.tar.gz libzmq-4.3.4 +catch2 cmake no catch2 https://gitee.com/will_niutao/catch2/raw/master/catch2.spec v3.3.2.tar.gz Catch2-3.3.2 +suitesparse cmake no suitesparse https://gitee.com/src-openeuler/suitesparse/raw/openEuler-22.03-LTS-SP1/suitesparse.spec SuiteSparse-5.10.1.tar.gz SuiteSparse-5.10.1 +ydlidar-sdk cmake no ydlidar-sdk https://gitee.com/will_niutao/ydlidar-sdk/raw/master/ydlidar-sdk.spec V1.1.3.tar.gz YDLidar-SDK-1.1.3 +metis cmake no metis https://gitee.com/src-openeuler/metis/raw/openEuler-22.03-LTS-SP1/metis.spec metis-5.1.0.tar.gz metis-5.1.0 +ceres-solver cmake no ceres-solver https://gitee.com/src-openeuler/ceres-solver/raw/master/ceres-solver.spec ceres-solver-2.0.0.tar.gz ceres-solver-2.0.0