diff --git a/clone-projects-from-gitee.sh b/clone-projects-from-gitee.sh index dded75d155421b00ad4c7e612c1ab8c303322337..c32609b3ef73502ba369c4d6e1de92c45ec81986 100755 --- a/clone-projects-from-gitee.sh +++ b/clone-projects-from-gitee.sh @@ -29,7 +29,8 @@ main() if [ -d ${GITEE_BASE}/${project}/.git ] then - info_log "project ${project} has been clone, ignore" + cd ${GITEE_BASE}/${project} + git pull origin humble continue fi diff --git a/create-graph-deps-for-check-list.sh b/create-graph-deps-for-check-list.sh index a2957a3c5ac5b142a9f517a9061eb038eda4eaa7..495ebe161ff567ff33f04898abb73adf1675c3b8 100755 --- a/create-graph-deps-for-check-list.sh +++ b/create-graph-deps-for-check-list.sh @@ -102,7 +102,7 @@ main() then for i in `cat ${ROS_OUTPUT_TMP}/.build_succeeded` do - sed -i "/Requires: $i/d" *.spec + sed -i "/Requires: $i$/d" *.spec done fi @@ -110,7 +110,7 @@ main() while read project do - sed -i "/$project/d" ros.dot + sed -i "/$project$/d" ros.dot done < .succeeded.list get_deps 1 ros.deps.more diff --git a/gen-pkg-spec.sh b/gen-pkg-spec.sh index 3c842be0819c2862192346529f626c62db973608..2fc2b094ddb6339829cf56c436afd620c346d909 100755 --- a/gen-pkg-spec.sh +++ b/gen-pkg-spec.sh @@ -189,6 +189,7 @@ modify_spec() gen_requires $pkg Requires Requires ROS_PACKAGE_REQUIRES $spec gen_requires $pkg BuildRequires BuildRequires ROS_PACKAGE_BUILDREQUIRES $spec gen_requires $pkg test-BuildRequires BuildRequires ROS_TEST_BUILDREQUIRES $spec + replace_key_word ROS_PROVIDES_FIX ${ROOT}/spec_fix/$pkg.Provides $spec if [ "$pkg" == "ament-cmake-core" -o "$pkg" == "ament-package" -o "$pkg" == "ros-workspace" ] then diff --git a/package_fix/console-bridge-vendor/0-console-bridge-vendor-change-cmake-download.patch b/package_fix/console-bridge-vendor/0-console-bridge-vendor-change-cmake-download.patch deleted file mode 100644 index c808e4ab691f414a99cc12a4926efa9cefd2a37a..0000000000000000000000000000000000000000 --- a/package_fix/console-bridge-vendor/0-console-bridge-vendor-change-cmake-download.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ros-humble-console-bridge-vendor-1.4.1_org/CMakeLists.txt ros-humble-console-bridge-vendor-1.4.1/CMakeLists.txt ---- ros-humble-console-bridge-vendor-1.4.1_org/CMakeLists.txt 2023-04-26 16:01:55.653557871 +0800 -+++ ros-humble-console-bridge-vendor-1.4.1/CMakeLists.txt 2023-04-26 16:03:50.311237487 +0800 -@@ -71,7 +71,7 @@ - - # Download and build console_bridge - externalproject_add(console_bridge-1.0.2 -- URL https://github.com/ros/console_bridge/archive/1.0.2.tar.gz -+ URL ${CMAKE_CURRENT_SOURCE_DIR}/1.0.2.tar.gz - URL_HASH SHA256=303a619c01a9e14a3c82eb9762b8a428ef5311a6d46353872ab9a904358be4a4 - TIMEOUT 600 - CMAKE_ARGS diff --git a/package_fix/console-bridge-vendor/1.0.2.tar.gz b/package_fix/console-bridge-vendor/1.0.2.tar.gz deleted file mode 100644 index 0b181debcd959da853369b7e1ac0ed1d5f2c7159..0000000000000000000000000000000000000000 Binary files a/package_fix/console-bridge-vendor/1.0.2.tar.gz and /dev/null differ diff --git a/package_fix/console-bridge-vendor/prep.fix b/package_fix/console-bridge-vendor/prep.fix deleted file mode 100644 index f5881bc920fe62c102d3779689c602c1bc5b7244..0000000000000000000000000000000000000000 --- a/package_fix/console-bridge-vendor/prep.fix +++ /dev/null @@ -1 +0,0 @@ -cp %{SOURCE1} . diff --git a/package_fix/console-bridge-vendor/source.fix b/package_fix/console-bridge-vendor/source.fix deleted file mode 100644 index c522693d1587ba0d508f794bb240899c3fecd5c8..0000000000000000000000000000000000000000 --- a/package_fix/console-bridge-vendor/source.fix +++ /dev/null @@ -1,2 +0,0 @@ -Source1: 1.0.2.tar.gz -Patch0: 0-console-bridge-vendor-change-cmake-download.patch diff --git a/package_fix/rmw-implementation/source.fix b/package_fix/rmw-implementation/source.fix new file mode 100644 index 0000000000000000000000000000000000000000..6907bc868f053ea46de0f9de2323e2fbbd34960a --- /dev/null +++ b/package_fix/rmw-implementation/source.fix @@ -0,0 +1,5 @@ + +Requires: ros-%{ros_distro}-rmw-implementation-packages(member) +%if 0%{?with_weak_deps} +Recommends: ros-%{ros_distro}-rmw-fastrtps-cpp +%endif diff --git a/spec_fix/console-bridge-vendor.BuildRequires b/spec_fix/console-bridge-vendor.BuildRequires deleted file mode 100644 index 36a58cd5e20483a22cbbbbf4404b709c00b31993..0000000000000000000000000000000000000000 --- a/spec_fix/console-bridge-vendor.BuildRequires +++ /dev/null @@ -1 +0,0 @@ --libconsole-bridge-dev diff --git a/spec_fix/console-bridge-vendor.Requires b/spec_fix/console-bridge-vendor.Requires deleted file mode 100644 index 36a58cd5e20483a22cbbbbf4404b709c00b31993..0000000000000000000000000000000000000000 --- a/spec_fix/console-bridge-vendor.Requires +++ /dev/null @@ -1 +0,0 @@ --libconsole-bridge-dev diff --git a/spec_fix/no-debuginfo b/spec_fix/no-debuginfo index a91f9d5c41998e71f0f5fb3c87f1ec3d2d093d88..10953a7524c23a0fa3955abbee38d91f0f22fb19 100644 --- a/spec_fix/no-debuginfo +++ b/spec_fix/no-debuginfo @@ -1,2 +1,3 @@ tlsf mavlink +sophus diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index 6d1b2e7f24529be8a79b0f494bd6afff9bd04ae5..cbda338f22fd3fd209e7e6ee61b1f156fad796d8 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -42,3 +42,16 @@ zlib zlib-devel libsqlite3-dev sqlite-devel google-mock gmock-devel benchmark google-benchmark-devel +libcunit-dev CUnit-devel +libssl-dev openssl-devel +asio asio-devel +libopencv-dev opencv +pybind11-dev pybind11-devel +libconsole-bridge-dev console-bridge-devel +libboost-program-options boost-program-options +libboost-program-options-dev boost-devel +uuid libuuid-devel +liborocos-kdl-dev orocos-kdl-devel +libgflags-dev gflags-devel +libboost-filesystem-dev boost-devel +libceres-dev ceres-solver-devel diff --git a/spec_fix/rmw-cyclonedds-cpp.Provides b/spec_fix/rmw-cyclonedds-cpp.Provides new file mode 100644 index 0000000000000000000000000000000000000000..f195a8308313e951730bdb15c47f2afaff2c8925 --- /dev/null +++ b/spec_fix/rmw-cyclonedds-cpp.Provides @@ -0,0 +1,5 @@ +Provides: ros-%{ros_distro}-rmw-implementation-packages(member) + +%if 0%{?with_weak_deps} +Supplements: ros-%{ros_distro}-rmw-implementation-packages(all) +%endif diff --git a/spec_fix/rmw-fastrtps-cpp.Provides b/spec_fix/rmw-fastrtps-cpp.Provides new file mode 100644 index 0000000000000000000000000000000000000000..f195a8308313e951730bdb15c47f2afaff2c8925 --- /dev/null +++ b/spec_fix/rmw-fastrtps-cpp.Provides @@ -0,0 +1,5 @@ +Provides: ros-%{ros_distro}-rmw-implementation-packages(member) + +%if 0%{?with_weak_deps} +Supplements: ros-%{ros_distro}-rmw-implementation-packages(all) +%endif diff --git a/spec_fix/rmw-fastrtps-dynamic-cpp.Provides b/spec_fix/rmw-fastrtps-dynamic-cpp.Provides new file mode 100644 index 0000000000000000000000000000000000000000..f195a8308313e951730bdb15c47f2afaff2c8925 --- /dev/null +++ b/spec_fix/rmw-fastrtps-dynamic-cpp.Provides @@ -0,0 +1,5 @@ +Provides: ros-%{ros_distro}-rmw-implementation-packages(member) + +%if 0%{?with_weak_deps} +Supplements: ros-%{ros_distro}-rmw-implementation-packages(all) +%endif diff --git a/spec_fix/rmw-implementation.BuildRequires b/spec_fix/rmw-implementation.BuildRequires new file mode 100644 index 0000000000000000000000000000000000000000..781f52991b48f0a2cf8baea67d41c37ce55091ac --- /dev/null +++ b/spec_fix/rmw-implementation.BuildRequires @@ -0,0 +1 @@ +-ros-%{ros_distro}-rmw-connextdds diff --git a/spec_fix/spec-type-fix b/spec_fix/spec-type-fix index c1ac0d0bc9e31b11dd5b2a8d258f3c53522ad53e..836368acaa4fbe0d329a89bb7a003d902ca415a9 100644 --- a/spec_fix/spec-type-fix +++ b/spec_fix/spec-type-fix @@ -1 +1,17 @@ angles cmake +message-filters cmake +pal-statistics cmake +resource-retriever cmake +dataspeed-ulc-can cmake +simple-actions cmake +neo-simulation2 cmake +camera-calibration-parsers cmake +rqt-image-overlay cmake +ruckig cmake +rtabmap-ros cmake +python-qt-binding cmake +qt-gui-py-common cmake +qt-dotgraph cmake +qt-gui-cpp cmake +rqt-image-view cmake +geodesy cmake diff --git a/template/cmake-ubuntu.spec b/template/cmake-ubuntu.spec index ddb5afd382889c9e2d20ff8ba55cf8ba86731af1..6c810880ff56f6825282440f6f42dc0524fe590a 100644 --- a/template/cmake-ubuntu.spec +++ b/template/cmake-ubuntu.spec @@ -31,6 +31,7 @@ ROS_TEST_BUILDREQUIRES Provides: %{name}-devel = %{version}-%{release} Provides: %{name}-doc = %{version}-%{release} Provides: %{name}-runtime = %{version}-%{release} +ROS_PROVIDES_FIX %description ROS_PACKAGE_DESCRIPTION diff --git a/template/cmake.spec b/template/cmake.spec index fc813cec0a446fd2351657c85c982479f9f46531..eb0e412be512b4a7674feb46b860ee98a056bccc 100644 --- a/template/cmake.spec +++ b/template/cmake.spec @@ -31,6 +31,7 @@ ROS_TEST_BUILDREQUIRES Provides: %{name}-devel = %{version}-%{release} Provides: %{name}-doc = %{version}-%{release} Provides: %{name}-runtime = %{version}-%{release} +ROS_PROVIDES_FIX %description ROS_PACKAGE_DESCRIPTION diff --git a/template/py-ubuntu.spec b/template/py-ubuntu.spec index c8c583f50654dfb16e60c218da156bdc4ff8226c..fb0a94eda9ba23730d02dbd9e0c16a08e40c736b 100644 --- a/template/py-ubuntu.spec +++ b/template/py-ubuntu.spec @@ -31,6 +31,7 @@ ROS_TEST_BUILDREQUIRES Provides: %{name}-devel = %{version}-%{release} Provides: %{name}-doc = %{version}-%{release} Provides: %{name}-runtime = %{version}-%{release} +ROS_PROVIDES_FIX %description ROS_PACKAGE_DESCRIPTION diff --git a/template/py.spec b/template/py.spec index 7a05d3a609fae0fffc7dc1c2c3cd8586f0696d7e..25d9586c9cb07386840fb5daadbedc3872de109e 100644 --- a/template/py.spec +++ b/template/py.spec @@ -31,6 +31,7 @@ ROS_TEST_BUILDREQUIRES Provides: %{name}-devel = %{version}-%{release} Provides: %{name}-doc = %{version}-%{release} Provides: %{name}-runtime = %{version}-%{release} +ROS_PROVIDES_FIX %description ROS_PACKAGE_DESCRIPTION