From 9edaddcc197c744e25c6cbe95ebc2bc23432f312 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sat, 30 Mar 2024 09:31:37 -0700 Subject: [PATCH 01/76] trying out ubuntu 24.04, but many basic packages won't install, including cmake, so return to this later --- ubuntu_2404/Dockerfile | 139 ++++++++ ubuntu_2404/base_repos.yaml | 669 ++++++++++++++++++++++++++++++++++++ ubuntu_2404/ignore.sh | 43 +++ 3 files changed, 851 insertions(+) create mode 100644 ubuntu_2404/Dockerfile create mode 100644 ubuntu_2404/base_repos.yaml create mode 100755 ubuntu_2404/ignore.sh diff --git a/ubuntu_2404/Dockerfile b/ubuntu_2404/Dockerfile new file mode 100644 index 0000000..c22cebe --- /dev/null +++ b/ubuntu_2404/Dockerfile @@ -0,0 +1,139 @@ +# docker build . -t ros_from_src_ubuntu_2404 +ARG IMAGE=ubuntu:24.04 +FROM ${IMAGE} +ARG IMAGE +RUN echo ${IMAGE} + +ENV DEBIAN_FRONTEND="noninteractive" + +# be able to source files +RUN rm /bin/sh && ln -s /bin/bash /bin/sh + +RUN apt-get update -yqq +RUN apt-get upgrade -yqq +RUN apt-get install -yqq apt-utils + +# apt installs +RUN apt-get update && apt-get install -yqq git +RUN apt-get update && apt-cache search ros- +RUN apt-get update && apt-cache search catkin +RUN apt-get update && apt-cache search vcs +RUN apt-get update && apt-get install -yqq catkin-tools vcstool +RUN apt-get update && apt-get install -yqq libgsl-dev wget freeglut3-dev libcgal-dev libhdf5-dev libturbojpeg0-dev libzmq3-dev +RUN apt-get -y install ocl-icd-opencl-dev opencl-headers +RUN apt-get update && apt-get install -yqq cython3 libapriltag-dev libceres-dev libfmt-dev libfrei0r-ocaml-dev libgmock-dev libgoogle-glog-dev +RUN apt-get update && apt-get install -yqq libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev liborocos-bfl-dev +RUN apt-get update && apt-get install -yqq curl jq +RUN apt-get update && apt-get install -yqq libyaml-cpp-dev +RUN apt-get update && apt-get install -yqq python-is-python3 python3-venv +RUN apt-get update && apt-get install -yqq libsdl-image1.2-dev libspnav-dev libuvc-dev libv4l-dev +RUN apt-get update && apt-get install -yqq libopenvdb-dev +RUN apt-get update && apt-get install -yqq catkin-lint +RUN apt-get update && apt-get install -yqq liburdfdom-dev +# RUN apt-get update && apt-get install -yqq libqt5svg5-dev libqt5websockets5-dev libqt5x11extras5-dev libqwt-qt5-dev +# libgeographic-dev libgst-dev +# vim is broken 'you have held broken packages' +RUN apt-cache search geographic +# RUN apt-get update && apt-get install -yqq libimage-view-dev +# RUN apt-get update && apt-get install -yqq libpcl-ros-dev +# RUN apt-get update && apt-get install -yqq python3-tf2-geometry-msgs +RUN apt-get update && apt-get install -yqq libgeographiclib-dev +RUN apt-cache search gst | grep dev +# RUN apt-get update && apt-get install -yqq ros-core +# RUN apt-get update && apt-get install -yqq ros-core-dev +RUN apt-get update && apt-cache search qt5 | grep dev +RUN apt-get update && apt-cache search ros- +# RUN apt-get update && apt-get install -yqq ros-desktop-full + + +# RUN apt-get update && apt-get install -yqq ros-* +ENV DEST=/opt/ros/base +RUN mkdir $DEST -p +ENV SRC=/opt/src +RUN mkdir $SRC -p + +WORKDIR $SRC +RUN python --version | awk '{print $2}' | cut -d'.' -f1 +RUN python --version | awk '{print $2}' | cut -d'.' -f2 +# TODO(lucasw) these aren't working +RUN export PYTHON_MAJOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f1` +RUN export PYTHON_MINOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f2` +RUN echo $PYTHON_MAJOR_VERSION +RUN echo $PYTHON_MINOR_VERSION +RUN python --version +# RUN PYTHON_MINOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f2` +ARG PYTHON_MAJOR_VERSION=3 +ARG PYTHON_MINOR_VERSION=12 +ENV OPT_PYTHONPATH=$DEST/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/site-packages/ +RUN echo $PYTHONPATH +ENV PYTHONPATH=$OPT_PYTHONPATH +RUN echo $PYTHONPATH + +ENV PATH=$DEST/bin:$PATH +ENV CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$DEST/lib/cmake + +# WORKDIR $SRC +# RUN git clone https://github.com/lucasw/ros_from_src.git +WORKDIR $SRC/ros_from_src/ubuntu_2404 +COPY base_repos.yaml . +# make git clone work through vcs without git credentials +RUN sed -i 's/git@github.com:/https:\/\/github.com\//' base_repos.yaml + +# get packages and build +ENV WS=/base_catkin_ws/src +RUN mkdir $WS -p +WORKDIR $WS +RUN vcs import --shallow < $SRC/ros_from_src/ubuntu_2404/base_repos.yaml +COPY ignore.sh $SRC/ros_from_src/ubuntu_2404/ +RUN $SRC/ros_from_src/ubuntu_2404/ignore.sh +RUN touch other/catkin_virtualenv/test_catkin_virtualenv_inherited/CATKIN_IGNORE +RUN touch other/catkin_virtualenv/test_catkin_virtualenv_isolated/CATKIN_IGNORE + +RUN mkdir -p $HOME/other/build/openvdb +WORKDIR other/build/openvdb +RUN apt-get install -yqq cmake +RUN cmake $WS/other/vdb/openvdb/ -DCMAKE_INSTALL_PREFIX=$DEST +RUN make -j2 # it's a slow build +RUN make install + +# ENV ROS_DISTRO="noetic" +RUN echo $CMAKE_PREFIX_PATH + +WORKDIR $WS/.. +RUN catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -Wno-dev -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=$DEST/include -DCMAKE_LIBRARY_PATH=$DEST/lib +# split these up so can take advantage of docker layers, otherwise one failure +# means a huge rebuild +# RUN catkin build --no-status -j1 fuse_core +# disabling this because it is too slow to build +# RUN catkin build --no-status -j1 rtabmap_ros +RUN catkin build --no-status -j1 vdb_mapping* +RUN catkin build --no-status -j1 jsk_rviz_plugins +RUN catkin build --no-status -j1 rviz +RUN catkin build --no-status -j1 plotjuggler +RUN catkin build --no-status -j1 rqt +RUN catkin build --no-status -j1 octomap_server +RUN catkin build --no-status -j1 libuvc_camera +# RUN catkin build --no-status -j1 fuse_constraints +RUN catkin build --no-status -j1 people_tracking_filter +RUN catkin build --no-status -j1 laser_assembler +RUN catkin build --no-status -j1 catkin_virtualenv +RUN catkin build --no-status -j1 nmea_navsat_driver +RUN catkin build --no-status -j1 grid_map_visualization +RUN catkin build --no-status -j1 stereo_image_proc +RUN catkin build --no-status -j1 jsk_topic_tools +RUN catkin build --no-status -j1 jsk_interactive_marker +# RUN catkin build --no-status -j1 test_catkin_virtualenv_inherited +# RUN catkin build --no-status -j1 test_catkin_virtualenv_py3_isolated +RUN catkin build --no-status -j1 + +# rospack list won't work by itself +# RUN source install/setup.bash && rospack list + +# TODO(lucasw) run more tests than this +RUN catkin build joint_trajectory_controller --no-status --no-deps --catkin-make-args tests +RUN ln -s /base_catkin_ws/install /opt/ros/one +RUN ls -l /opt/ros/one +# make 'source' work +SHELL ["/bin/bash", "-c"] +RUN source /opt/ros/one/setup.sh && rospack list +# RUN source install/setup.sh && rostest joint_trajectory_controller joint_trajectory_controller.test diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml new file mode 100644 index 0000000..018b8be --- /dev/null +++ b/ubuntu_2404/base_repos.yaml @@ -0,0 +1,669 @@ +repositories: + clearpath/cpr_gazebo: + type: git + url: https://github.com/clearpathrobotics/cpr_gazebo.git + version: noetic-devel + clearpath/husky: + type: git + url: git@github.com:lucasw/husky + version: roslint_fixes + clearpath/moose: + type: git + url: git@github.com:lucasw/moose + version: pluginlib_hpp + clearpath/moose_simulator: + type: git + url: git@github.com:moose-cpr/moose_simulator.git + version: master + clearpath/warthog: + type: git + url: git@github.com:warthog-cpr/warthog + version: kinetic-devel + clearpath/warthog_simulator: + type: git + url: git@github.com:warthog-cpr/warthog_simulator.git + version: melodic-devel + extra/common_msgs: + type: git + url: git@github.com:ros/common_msgs.git + version: noetic-devel + extra/geometry: + type: git + url: git@github.com:ros-o/geometry.git + version: obese-devel + extra/laser_geometry: + type: git + url: git@github.com:ros-o/laser_geometry.git + version: obese-devel + extra/navigation_msgs: + type: git + url: git@github.com:ros-planning/navigation_msgs.git + version: ros1 + extra/pcl_msgs: + type: git + url: git@github.com:ros-perception/pcl_msgs.git + version: noetic-devel + extra/perception_pcl: + type: git + url: git@github.com:ros-o/perception_pcl.git + version: obese-devel + extra/vision_opencv: + type: git + url: git@github.com:ros-perception/vision_opencv.git + version: noetic + greenzie/boustrophedon_planner: + type: git + url: git@github.com:lucasw/boustrophedon_planner + version: cpp17 + lucasw/carbot: + type: git + url: git@github.com:lucasw/carbot + version: master + lucasw/dynamic_reconfigure_tools: + type: git + url: git@github.com:lucasw/dynamic_reconfigure_tools + version: master + lucasw/frei0r_image: + type: git + url: git@github.com:lucasw/frei0r_image + version: master + lucasw/image_manip: + type: git + url: git@github.com:lucasw/image_manip + version: fix_zero_frame_rate + lucasw/joy_feedback_ros: + type: git + url: git@github.com:lucasw/joy_feedback_ros + version: master + lucasw/nodelet_demo: + type: git + url: git@github.com:lucasw/nodelet_demo + version: master + lucasw/popcanbot: + type: git + url: git@github.com:lucasw/popcanbot + version: master + lucasw/ros1_lifecycle: + type: git + url: git@github.com:lucasw/ros1_lifecycle + version: misc_fixes + lucasw/ros_example: + type: git + url: git@github.com:lucasw/ros_example + version: main + lucasw/ros_system_monitor: + type: git + url: git@github.com:lucasw/ros_system_monitor + version: chrony_monitor + lucasw/rqt_file_dialog: + type: git + url: git@github.com:lucasw/rqt_file_dialog + version: master + lucasw/rqt_tf_echo: + type: git + url: git@github.com:lucasw/rqt_tf_echo.git + version: master + lucasw/rqt_topic_display: + type: git + url: git@github.com:lucasw/rqt_topic_display.git + version: master + lucasw/rviz_camera_stream: + type: git + url: git@github.com:lucasw/rviz_camera_stream + version: noetic-devel + lucasw/rviz_interactive_tf: + type: git + url: git@github.com:lucasw/rviz_interactive_tf + version: master + lucasw/rviz_lighting: + type: git + url: git@github.com:lucasw/rviz_lighting + version: cpp17 + lucasw/rviz_ortho_view_controller: + type: git + url: git@github.com:lucasw/rviz_ortho_view_controller.git + version: master + lucasw/screengrab_ros: + type: git + url: git@github.com:lucasw/screengrab_ros + version: master + lucasw/signal_generator: + type: git + url: git@github.com:lucasw/signal_generator + version: master + lucasw/simple_sim_ros: + type: git + url: git@github.com:lucasw/simple_sim_ros + version: master + lucasw/tf_demo: + type: git + url: git@github.com:lucasw/tf_demo + version: old_tf_to_new_tf + lucasw/timer_test: + type: git + url: git@github.com:lucasw/timer_test + version: master + lucasw/topic_state: + type: git + url: git@github.com:lucasw/topic_state + version: master + lucasw/transform_point_cloud: + type: git + url: git@github.com:lucasw/transform_point_cloud.git + version: master + lucasw/v4l2ucp: + type: git + url: git@github.com:lucasw/v4l2ucp + version: master + lucasw/vimjay: + type: git + url: git@github.com:lucasw/vimjay + version: eliminate_build_warnings + opencv_apps: + type: git + url: git@github.com:ros-perception/opencv_apps.git + version: indigo + other/PlotJuggler: + type: git + url: git@github.com:facontidavide/PlotJuggler.git + version: main + other/anybotics/elevation_mapping: + type: git + url: git@github.com:ANYbotics/elevation_mapping.git + version: master + other/anybotics/kindr: + type: git + url: git@github.com:ANYbotics/kindr + version: master + other/anybotics/kindr_ros: + type: git + url: git@github.com:lucasw/kindr_ros + version: cpp17 + other/anybotics/message_logger: + type: git + url: git@github.com:lucasw/message_logger + version: line_endings + other/anybotics/point_cloud_io: + type: git + url: git@github.com:ANYbotics/point_cloud_io + version: master + other/apriltag_ros: + type: git + url: git@github.com:AprilRobotics/apriltag_ros.git + version: master + other/camera_throttler_nodelets: + type: git + url: git@github.com:lucasw/camera_throttler_nodelets.git + version: noetic_aggregated + other/catkin_virtualenv: + type: git + url: git@github.com:locusrobotics/catkin_virtualenv.git + version: master + other/ddynamic_reconfigure: + type: git + url: git@github.com:ros-o/ddynamic_reconfigure + version: obese-devel + other/depthai-ros-examples: + type: git + url: git@github.com:luxonis/depthai-ros-examples.git + version: main + other/euslisp-release: + type: git + url: git@github.com:tork-a/euslisp-release.git + version: release/melodic/euslisp + other/ffmpeg_image_transport: + type: git + url: git@github.com:lucasw/ffmpeg_image_transport + version: noetic_aggregated + other/ffmpeg_image_transport_msgs: + type: git + url: git@github.com:daniilidis-group/ffmpeg_image_transport_msgs.git + version: master + other/fiducials: + type: git + url: git@github.com:lucasw/fiducials + version: cmake_vision_msgs + other/find-object: + type: git + url: git@github.com:lucasw/find-object.git + version: master + other/fuse: + type: git + url: git@github.com:lucasw/fuse + version: cpp17 + other/geneus: + type: git + url: git@github.com:jsk-ros-pkg/geneus.git + version: master + other/graph_rviz_plugin: + type: git + url: git@github.com:lucasw/graph_rviz_plugin + version: pluginlib_hpp + other/hector_slam: + type: git + url: git@github.com:lucasw/hector_slam + version: boost_placeholders + other/jsk_common: + type: git + url: git@github.com:lucasw/jsk_common + version: video_to_bag_features + other/jsk_common_msgs: + type: git + url: git@github.com:lucasw/jsk_common_msgs + version: master + other/jsk_recognition: + type: git + url: git@github.com:lucasw/jsk_recognition + version: pcl_vtk_isfinite + other/jsk_roseus: + type: git + url: git@github.com:jsk-ros-pkg/jsk_roseus.git + version: master + other/jsk_visualization: + type: git + url: git@github.com:lucasw/jsk_visualization + version: boost_placeholders + other/libnabo: + type: git + url: git@github.com:ethz-asl/libnabo + version: master + other/lvr2: + type: git + url: git@github.com:lucasw/lvr2 + version: ros1_or_2 + other/marti_messages: + type: git + url: git@github.com:swri-robotics/marti_messages.git + version: master + other/mavros: + type: git + url: git@github.com:lucasw/mavros + version: master + other/mesh_tools: + type: git + url: git@github.com:lucasw/mesh_tools + version: generate_mesh_geometry + other/message_filters: + type: git + url: git@github.com:fkie/message_filters.git + version: master + other/nmea_navsat_driver: + type: git + url: git@github.com:ros-drivers/nmea_navsat_driver.git + version: master + other/nodelet_rosbag: + type: git + url: git@github.com:lucasw/nodelet_rosbag + version: pluginlib_hpp + other/octomap_mapping: + type: git + url: git@github.com:octomap/octomap_mapping.git + version: kinetic-devel + other/octomap_ros: + type: git + url: git@github.com:octomap/octomap_ros + version: melodic-devel + other/openni2_camera: + type: git + url: git@github.com:lucasw/openni2_camera.git + version: subprocess_wtf_python3_7 + other/pal_statistics: + type: git + url: git@github.com:pal-robotics/pal_statistics.git + version: kinetic-devel + other/people: + type: git + url: git@github.com:wg-perception/people.git + version: melodic + other/pid: + type: git + url: git@github.com:lucasw/pid.git + version: boost_placeholders + other/plotjuggler-ros-plugins: + type: git + url: git@github.com:PlotJuggler/plotjuggler-ros-plugins.git + version: main + other/plotjuggler_msgs: + type: git + url: git@github.com:PlotJuggler/plotjuggler_msgs.git + version: main + other/point_cloud_converter: + type: git + url: git@github.com:pal-robotics-forks/point_cloud_converter.git + version: hydro-devel + other/ros_control_boilerplate: + type: git + url: git@github.com:lucasw/ros_control_boilerplate + version: cpp17 + other/ros_numpy: + type: git + url: git@github.com:lucasw/ros_numpy.git + version: collections_abc + other/ros_rtsp: + type: git + url: git@github.com:lucasw/ros_rtsp + version: pluginlib_hpp + other/ros_type_introspection: + type: git + url: git@github.com:lucasw/ros_type_introspection.git + version: build_2204 + other/rosbag_snapshot: + type: git + url: git@github.com:ros/rosbag_snapshot.git + version: main + other/rosboard: + type: git + url: git@github.com:dheera/rosboard.git + version: main + other/rosfmt: + type: git + url: git@github.com:lucasw/rosfmt + version: build_2204 + other/rosmon: + type: git + url: git@github.com:lucasw/rosmon + version: build_2204 + other/rosshow: + type: git + url: git@github.com:dheera/rosshow + version: main + other/rqt_ez_publisher: + type: git + url: git@github.com:lucasw/rqt_ez_publisher + version: ubuntu2210 + other/rtabmap: + type: git + url: git@github.com:introlab/rtabmap.git + version: master + other/rtabmap_ros: + type: git + url: git@github.com:introlab/rtabmap_ros + version: master + other/static_transform_mux: + type: git + url: git@github.com:tradr-project/static_transform_mux.git + version: master + other/tf2_2d: + type: git + url: git@github.com:locusrobotics/tf2_2d.git + version: devel + other/turtlebot: + type: git + url: git@github.com:turtlebot/turtlebot + version: melodic + other/vdb/openvdb: + type: git + url: git@github.com:AcademySoftwareFoundation/openvdb.git + version: master + other/vdb/vdb_mapping: + type: git + url: git@github.com:lucasw/vdb_mapping + version: min_range + other/vdb/vdb_mapping_ros: + type: git + url: git@github.com:lucasw/vdb_mapping_ros + version: rolling_window + other/wu_ros_tools: + type: git + url: git@github.com:lucasw/wu_ros_tools + version: kinetic + ros/async_web_server_cpp: + type: git + url: git@github.com:lucasw/async_web_server_cpp.git + version: ros1-develop + ros/audio_common: + type: git + url: git@github.com:ros-drivers/audio_common.git + version: master + ros/camera_info_manager_py: + type: git + url: git@github.com:lucasw/camera_info_manager_py + version: noetic-devel + ros/common_tutorials: + type: git + url: git@github.com:lucasw/common_tutorials.git + version: boost_placeholders + ros/control_msgs: + type: git + url: git@github.com:ros-controls/control_msgs.git + version: kinetic-devel + ros/ddynamic_reconfigure_python: + type: git + url: git@github.com:pal-robotics/ddynamic_reconfigure_python + version: master + ros/diagnostics: + type: git + url: git@github.com:ros/diagnostics.git + version: noetic-devel + ros/dynamic_reconfigure: + type: git + url: git@github.com:lucasw/dynamic_reconfigure + version: init_default_values + ros/filters: + type: git + url: git@github.com:ros/filters.git + version: noetic-devel + ros/four_wheel_steering_msgs: + type: git + url: git@github.com:ros-drivers/four_wheel_steering_msgs.git + version: master + ros/gazebo_ros_demos: + type: git + url: git@github.com:lucasw/gazebo_ros_demos + version: noetic-devel + ros/gazebo_ros_pkgs: + type: git + url: git@github.com:lucasw/gazebo_ros_pkgs + version: noetic_debug_plugins + ros/geographic_info: + type: git + url: git@github.com:ros-geographic-info/geographic_info.git + version: master + ros/geometry2: + type: git + url: git@github.com:lucasw/geometry2 + version: noetic_aggregated + ros/grid_map: + type: git + url: git@github.com:lucasw/grid_map + version: tbb_2021 + ros/image_common: + type: git + url: git@github.com:lucasw/image_common + version: ubuntu_2210 + ros/image_pipeline: + type: git + url: git@github.com:lucasw/image_pipeline + version: rgb_in_depth_range + ros/image_transport_plugins: + type: git + url: git@github.com:lucasw/image_transport_plugins + version: enable_pub + ros/joint_state_publisher: + type: git + url: git@github.com:lucasw/joint_state_publisher + version: noetic_aggregated + ros/joystick_drivers: + type: git + url: git@github.com:lucasw/joystick_drivers + version: warn_not_error_if_no_joy + ros/laser_assembler: + type: git + url: git@github.com:lucasw/laser_assembler + version: noetic-devel + ros/libuvc_ros: + type: git + url: git@github.com:lucasw/libuvc_ros.git + version: boost_placeholders + ros/media_export: + type: git + url: git@github.com:ros/media_export.git + version: kinetic-devel + ros/navigation: + type: git + url: git@github.com:lucasw/navigation + version: lucasw_debug + ros/nmea_msgs: + type: git + url: git@github.com:ros-drivers/nmea_msgs + version: master + ros/octomap_msgs: + type: git + url: git@github.com:OctoMap/octomap_msgs.git + version: melodic-devel + ros/realtime_tools: + type: git + url: git@github.com:ros-controls/realtime_tools.git + version: noetic-devel + ros/robot_localization: + type: git + url: git@github.com:lucasw/robot_localization + version: boost_placeholders_cpp17 + ros/robot_state_publisher: + type: git + url: git@github.com:lucasw/robot_state_publisher + version: robot_state_function + ros/ros_comm: + type: git + url: git@github.com:lucasw/ros_comm + version: salsa_noetic_aggregated + ros/ros_control: + type: git + url: git@github.com:lucasw/ros_control + version: acceleration_limits + ros/ros_controllers: + type: git + url: git@github.com:lucasw/ros_controllers + version: avoid_no_trajectory_defined + ros/ros_tutorials: + type: git + url: git@github.com:lucasw/ros_tutorials.git + version: boost_placeholders + ros/rosconsole: + type: git + url: git@github.com:lucasw/rosconsole + version: ubuntu_2210 + ros/roscpp_core: + type: git + url: git@github.com:lucasw/roscpp_core + version: duration_out_of_dual_range + ros/roslint: + type: git + url: git@github.com:lucasw/roslint + version: roslint_rust + ros/rospack: + type: git + url: git@github.com:lucasw/rospack + version: salsa + ros/rqt: + type: git + url: git@github.com:lucasw/rqt + version: ubuntu_2210 + ros/rqt_bag: + type: git + url: git@github.com:lucasw/rqt_bag + version: build_2204 + ros/rqt_console: + type: git + url: git@github.com:ros-visualization/rqt_console.git + version: master + ros/rqt_graph: + type: git + url: git@github.com:ros-visualization/rqt_graph.git + version: master + ros/rqt_logger_level: + type: git + url: git@github.com:ros-visualization/rqt_logger_level.git + version: master + ros/rqt_plot: + type: git + url: git@github.com:ros-visualization/rqt_plot.git + version: master + ros/rqt_reconfigure: + type: git + url: https://github.com/ros-visualization/rqt_reconfigure + version: master + ros/rqt_robot_monitor: + type: git + url: git@github.com:ros-visualization/rqt_robot_monitor.git + version: ros1 + ros/rqt_robot_steering: + type: git + url: git@github.com:lucasw/rqt_robot_steering.git + version: python310 + ros/rqt_tf_tree: + type: git + url: git@github.com:ros-visualization/rqt_tf_tree.git + version: master + ros/rviz: + type: git + url: git@github.com:lucasw/rviz.git + version: misc_fixes + ros/teleop_twist_joy: + type: git + url: git@github.com:lucasw/teleop_twist_joy + version: cmp0115_cpp_extension + ros/teleop_twist_keyboard: + type: git + url: git@github.com:ros-teleop/teleop_twist_keyboard.git + version: master + ros/twist_mux: + type: git + url: git@github.com:lucasw/twist_mux + version: ubuntu2210 + ros/twist_mux_msgs: + type: git + url: git@github.com:ros-teleop/twist_mux_msgs + version: melodic-devel + ros/unique_identifier: + type: git + url: git@github.com:ros-geographic-info/unique_identifier.git + version: master + ros/urdf_geometry_parser: + type: git + url: git@github.com:ros-controls/urdf_geometry_parser.git + version: kinetic-devel + ros/urdf_parser_py: + type: git + url: git@github.com:ros/urdf_parser_py.git + version: melodic-devel + ros/usb_cam: + type: git + url: git@github.com:ros-drivers/usb_cam.git + version: develop + ros/video_stream_opencv: + type: git + url: git@github.com:lucasw/video_stream_opencv + version: build_2204 + ros/view_controller_msgs: + type: git + url: git@github.com:ros-visualization/view_controller_msgs.git + version: lunar-devel + ros/vision_msgs: + type: git + url: git@github.com:ros-perception/vision_msgs.git + version: noetic-devel + ros/web_video_server: + type: git + url: git@github.com:lucasw/web_video_server + version: boost_placeholders + ros/xacro: + type: git + url: git@github.com:lucasw/xacro.git + version: cleanup_roslint + roso/control_toolbox: + type: git + url: git@github.com:ros-o/control_toolbox + version: obese-devel + roso/qt_gui_core: + type: git + url: git@github.com:lucasw/qt_gui_core + version: ubuntu_2210 + roso/rosparam_shortcuts: + type: git + url: git@github.com:lucasw/rosparam_shortcuts + version: cleanup_lint + roso/rqt_image_view: + type: git + url: git@github.com:lucasw/rqt_image_view + version: detection2d_image_view diff --git a/ubuntu_2404/ignore.sh b/ubuntu_2404/ignore.sh new file mode 100755 index 0000000..f3a2456 --- /dev/null +++ b/ubuntu_2404/ignore.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# These are ignored because they don't yet build in 22.04, need modifications, +# or depend on gazebo +touch ./clearpath/CATKIN_IGNORE +touch ./clearpath/husky/husky_gazebo/CATKIN_IGNORE +touch ./clearpath/moose_simulator/CATKIN_IGNORE +touch ./clearpath/warthog_simulator/CATKIN_IGNORE +touch ./greenzie/boustrophedon_planner/CATKIN_IGNORE +touch ./other/anybotics/elevation_mapping/CATKIN_IGNORE +touch ./other/catkin_virtualenv/test_catkin_virtualenv/CATKIN_IGNORE +# touch ./other/catkin_virtualenv/test_catkin_virtualenv_python2/CATKIN_IGNORE +touch ./other/depthai-ros-examples/CATKIN_IGNORE +touch ./other/ffmpeg_image_transport/CATKIN_IGNORE +touch ./other/ffmpeg_image_transport_msgs/CATKIN_IGNORE +touch ./other/fiducials/aruco_gazebo/CATKIN_IGNORE +touch ./other/jsk_common/jsk_rosbag_tools/CATKIN_IGNORE +touch ./other/jsk_recognition/imagesift/CATKIN_IGNORE +touch ./other/jsk_recognition/jsk_libfreenect2/CATKIN_IGNORE +touch ./other/jsk_recognition/jsk_pcl_ros/CATKIN_IGNORE +touch ./other/jsk_recognition/jsk_pcl_ros_utils/CATKIN_IGNORE +touch ./other/jsk_recognition/jsk_perception/CATKIN_IGNORE +touch ./other/jsk_recognition/sound_classification/CATKIN_IGNORE +touch ./other/jsk_roseus/CATKIN_IGNORE +touch ./other/jsk_roseus/roseus_msgs/CATKIN_IGNORE +touch ./other/euslisp-release/CATKIN_IGNORE +touch ./other/geneus/CATKIN_IGNORE +# touch ./other/mesh_tools/mesh_msgs_hdf5/CATKIN_IGNORE +# touch ./other/mesh_tools/hdf5_map_io/CATKIN_IGNORE +# touch ./other/mesh_tools/rviz_map_plugin/CATKIN_IGNORE +touch ./other/mavros/libmavconn/CATKIN_IGNORE +touch ./other/mavros/mavros/CATKIN_IGNORE +touch ./other/mavros/mavros_extras/CATKIN_IGNORE +touch ./other/mavros/test_mavros/CATKIN_IGNORE +touch ./other/openni2_camera/CATKIN_IGNORE +touch ./other/people/face_detector/CATKIN_IGNORE +touch ./other/people/leg_detector/CATKIN_IGNORE +touch ./other/ros_rtsp/CATKIN_IGNORE +touch ./other/pal_statistics/pal_statistics/CATKIN_IGNORE +touch ./ros/gazebo_ros_demos/CATKIN_IGNORE +touch ./ros/gazebo_ros_pkgs/CATKIN_IGNORE +touch ./ros/joystick_drivers/ps3joy/CATKIN_IGNORE +touch ./ros/joystick_drivers/wiimote/CATKIN_IGNORE +touch ./ros/web_video_server/CATKIN_IGNORE From eb95927e3624fa24669433bdf8f66a57b6f31bfb Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Mon, 15 Apr 2024 11:43:44 -0700 Subject: [PATCH 02/76] building cmake from source in 24.04 --- ubuntu_2404/Dockerfile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ubuntu_2404/Dockerfile b/ubuntu_2404/Dockerfile index c22cebe..f80e948 100644 --- a/ubuntu_2404/Dockerfile +++ b/ubuntu_2404/Dockerfile @@ -89,9 +89,18 @@ RUN $SRC/ros_from_src/ubuntu_2404/ignore.sh RUN touch other/catkin_virtualenv/test_catkin_virtualenv_inherited/CATKIN_IGNORE RUN touch other/catkin_virtualenv/test_catkin_virtualenv_isolated/CATKIN_IGNORE +# RUN apt-get install -yqq cmake +RUN git clone https://gitlab.kitware.com/cmake/cmake.git +WORKDIR $WS/cmake +RUN apt-get install -yqq g++ +RUN apt-get install -yqq make +RUN ./bootstrap && make && make install + +RUN apt-get install -yqq libboost-iostreams-dev +RUN apt-get install -yqq libjemalloc-dev + RUN mkdir -p $HOME/other/build/openvdb WORKDIR other/build/openvdb -RUN apt-get install -yqq cmake RUN cmake $WS/other/vdb/openvdb/ -DCMAKE_INSTALL_PREFIX=$DEST RUN make -j2 # it's a slow build RUN make install From f6cca058a799df3792bc7fa5fe526de962d473c7 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Mon, 15 Apr 2024 17:00:09 -0700 Subject: [PATCH 03/76] 24.04 apt install are working now --- ubuntu_2404/Dockerfile | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/ubuntu_2404/Dockerfile b/ubuntu_2404/Dockerfile index f80e948..ea13a60 100644 --- a/ubuntu_2404/Dockerfile +++ b/ubuntu_2404/Dockerfile @@ -34,19 +34,22 @@ RUN apt-get update && apt-get install -yqq liburdfdom-dev # libgeographic-dev libgst-dev # vim is broken 'you have held broken packages' RUN apt-cache search geographic -# RUN apt-get update && apt-get install -yqq libimage-view-dev -# RUN apt-get update && apt-get install -yqq libpcl-ros-dev -# RUN apt-get update && apt-get install -yqq python3-tf2-geometry-msgs +RUN apt-get update && apt-get install -yqq libimage-view-dev +RUN apt-get update && apt-get install -yqq libpcl-ros-dev +RUN apt-get update && apt-get install -yqq python3-tf2-geometry-msgs RUN apt-get update && apt-get install -yqq libgeographiclib-dev RUN apt-cache search gst | grep dev -# RUN apt-get update && apt-get install -yqq ros-core -# RUN apt-get update && apt-get install -yqq ros-core-dev -RUN apt-get update && apt-cache search qt5 | grep dev +RUN apt-get update && apt-get install -yqq ros-core +RUN apt-get update && apt-get install -yqq ros-core-dev RUN apt-get update && apt-cache search ros- -# RUN apt-get update && apt-get install -yqq ros-desktop-full +RUN apt-get update && apt-get install -yqq ros-desktop-full +RUN apt-get update && apt-cache search qt5 | grep dev + +RUN apt-get install -yqq build-essential +RUN apt-get install -yqq libboost-iostreams-dev +RUN apt-get install -yqq libjemalloc-dev -# RUN apt-get update && apt-get install -yqq ros-* ENV DEST=/opt/ros/base RUN mkdir $DEST -p ENV SRC=/opt/src @@ -89,16 +92,6 @@ RUN $SRC/ros_from_src/ubuntu_2404/ignore.sh RUN touch other/catkin_virtualenv/test_catkin_virtualenv_inherited/CATKIN_IGNORE RUN touch other/catkin_virtualenv/test_catkin_virtualenv_isolated/CATKIN_IGNORE -# RUN apt-get install -yqq cmake -RUN git clone https://gitlab.kitware.com/cmake/cmake.git -WORKDIR $WS/cmake -RUN apt-get install -yqq g++ -RUN apt-get install -yqq make -RUN ./bootstrap && make && make install - -RUN apt-get install -yqq libboost-iostreams-dev -RUN apt-get install -yqq libjemalloc-dev - RUN mkdir -p $HOME/other/build/openvdb WORKDIR other/build/openvdb RUN cmake $WS/other/vdb/openvdb/ -DCMAKE_INSTALL_PREFIX=$DEST From dcb10108f9de793197d5b68b81d9fea9a8c93cf3 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Mon, 15 Apr 2024 20:48:26 -0700 Subject: [PATCH 04/76] now have rqt building in 24.04 --- ubuntu_2204/Dockerfile | 2 ++ ubuntu_2404/Dockerfile | 19 +++++++++++++------ ubuntu_2404/base_repos.yaml | 12 ++++++++---- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ubuntu_2204/Dockerfile b/ubuntu_2204/Dockerfile index 7a581a7..7247eab 100644 --- a/ubuntu_2204/Dockerfile +++ b/ubuntu_2204/Dockerfile @@ -15,6 +15,8 @@ RUN apt-get install -yqq apt-utils # apt installs RUN apt-get update && apt-get install -yqq git +RUN apt-get update && apt-cache search ros- +RUN apt-get update && apt-cache search catkin RUN apt-get update && apt-get install -yqq ros-* RUN apt-get update && apt-get install -yqq catkin-lint cython3 libapriltag-dev libceres-dev libfmt-dev libfrei0r-ocaml-dev libgeographic-dev libgmock-dev libgoogle-glog-dev libgst-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libimage-view-dev liborocos-bfl-dev libpcl-ros-dev libqt5svg5-dev libqt5websockets5-dev libqt5x11extras5-dev libqwt-qt5-dev libsdl-image1.2-dev libspnav-dev liburdfdom-dev libuvc-dev libv4l-dev libyaml-cpp-dev python-is-python3 python3-tf2-geometry-msgs python3-venv vim curl jq RUN apt-get update && apt-get install -yqq libgsl-dev wget freeglut3-dev libcgal-dev libhdf5-dev libturbojpeg0-dev libzmq3-dev diff --git a/ubuntu_2404/Dockerfile b/ubuntu_2404/Dockerfile index ea13a60..b229e7f 100644 --- a/ubuntu_2404/Dockerfile +++ b/ubuntu_2404/Dockerfile @@ -92,11 +92,15 @@ RUN $SRC/ros_from_src/ubuntu_2404/ignore.sh RUN touch other/catkin_virtualenv/test_catkin_virtualenv_inherited/CATKIN_IGNORE RUN touch other/catkin_virtualenv/test_catkin_virtualenv_isolated/CATKIN_IGNORE -RUN mkdir -p $HOME/other/build/openvdb -WORKDIR other/build/openvdb -RUN cmake $WS/other/vdb/openvdb/ -DCMAKE_INSTALL_PREFIX=$DEST -RUN make -j2 # it's a slow build -RUN make install +RUN apt-cache search openvdb +RUN dpkg -l | grep openvdb +# RUN mkdir -p $HOME/other/build/openvdb +# WORKDIR other/build/openvdb +# RUN cmake $WS/other/vdb/openvdb/ -DCMAKE_INSTALL_PREFIX=$DEST +# RUN make -j2 # it's a slow build +# RUN make install +RUN dpkg -l | grep ros +# RUN dpkg -l | grep rqt # ENV ROS_DISTRO="noetic" RUN echo $CMAKE_PREFIX_PATH @@ -108,11 +112,14 @@ RUN catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-depreca # RUN catkin build --no-status -j1 fuse_core # disabling this because it is too slow to build # RUN catkin build --no-status -j1 rtabmap_ros +RUN apt-get install -yqq libpyside2-dev +RUN apt-get install -yqq python3-sip-dev +RUN apt-get install -yqq pyqt5-dev +RUN catkin build --no-status -j1 rqt RUN catkin build --no-status -j1 vdb_mapping* RUN catkin build --no-status -j1 jsk_rviz_plugins RUN catkin build --no-status -j1 rviz RUN catkin build --no-status -j1 plotjuggler -RUN catkin build --no-status -j1 rqt RUN catkin build --no-status -j1 octomap_server RUN catkin build --no-status -j1 libuvc_camera # RUN catkin build --no-status -j1 fuse_constraints diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index 018b8be..371fdf3 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -27,10 +27,10 @@ repositories: type: git url: git@github.com:ros/common_msgs.git version: noetic-devel - extra/geometry: - type: git - url: git@github.com:ros-o/geometry.git - version: obese-devel + # extra/geometry: + # type: git + # url: git@github.com:ros-o/geometry.git + # version: obese-devel extra/laser_geometry: type: git url: git@github.com:ros-o/laser_geometry.git @@ -47,6 +47,10 @@ repositories: type: git url: git@github.com:ros-o/perception_pcl.git version: obese-devel + extra/python_qt_binding: + type: git + url: git@github.com:ros-o/python_qt_binding.git + version: obese-devel extra/vision_opencv: type: git url: git@github.com:ros-perception/vision_opencv.git From 6b4629193132a5566b11a2725d38760f656d8665 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 16 Apr 2024 05:58:59 -0700 Subject: [PATCH 05/76] use humble version of lvr2 which builds using cmake --- ubuntu_2204/base_repos.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu_2204/base_repos.yaml b/ubuntu_2204/base_repos.yaml index 018b8be..0d9f69f 100644 --- a/ubuntu_2204/base_repos.yaml +++ b/ubuntu_2204/base_repos.yaml @@ -269,8 +269,8 @@ repositories: version: master other/lvr2: type: git - url: git@github.com:lucasw/lvr2 - version: ros1_or_2 + url: git@github.com:uos/lvr2 + version: humble other/marti_messages: type: git url: git@github.com:swri-robotics/marti_messages.git From 3bbdf9ff4830c9c28d47336b4d961c6ba59b3108 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 16 Apr 2024 10:46:22 -0700 Subject: [PATCH 06/76] use libuvc_0_0_7 libuvc_ros --- ubuntu_2204/base_repos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu_2204/base_repos.yaml b/ubuntu_2204/base_repos.yaml index 0d9f69f..5f41763 100644 --- a/ubuntu_2204/base_repos.yaml +++ b/ubuntu_2204/base_repos.yaml @@ -494,7 +494,7 @@ repositories: ros/libuvc_ros: type: git url: git@github.com:lucasw/libuvc_ros.git - version: boost_placeholders + version: libuvc_0_0_7 ros/media_export: type: git url: git@github.com:ros/media_export.git From 695d0dff44ef872fc753d6bef0d77dae1b9fdc98 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 16 Apr 2024 10:47:21 -0700 Subject: [PATCH 07/76] making progress with 24.04 docker build --- ubuntu_2404/Dockerfile | 27 ++++++++++++++++++++++----- ubuntu_2404/base_repos.yaml | 6 +++--- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/ubuntu_2404/Dockerfile b/ubuntu_2404/Dockerfile index b229e7f..ff85861 100644 --- a/ubuntu_2404/Dockerfile +++ b/ubuntu_2404/Dockerfile @@ -43,13 +43,31 @@ RUN apt-get update && apt-get install -yqq ros-core RUN apt-get update && apt-get install -yqq ros-core-dev RUN apt-get update && apt-cache search ros- RUN apt-get update && apt-get install -yqq ros-desktop-full -RUN apt-get update && apt-cache search qt5 | grep dev + +# install every ros package +RUN apt-get update && apt-get install -yqq `apt-cache search "Robot OS" | awk '{print $1}' | xargs | sed 's/\n/ /g'` +RUN apt-get install -yqq libtf-conversions-dev RUN apt-get install -yqq build-essential RUN apt-get install -yqq libboost-iostreams-dev RUN apt-get install -yqq libjemalloc-dev +# from rosdep +RUN apt-get install -yqq binutils-dev festival festvox-kallpc16k ffmpeg flite google-mock gstreamer1.0-alsa gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-tools +RUN apt-get install -yqq ifstat iproute2 iputils-ping joystick libassimp-dev libbullet-dev libgstreamer-plugins-good1.0-0 libprotobuf-dev libprotoc-dev +RUN apt-get install -yqq libqt5svg5-dev libqt5websockets5-dev libqt5x11extras5-dev libqwt-qt5-dev +RUN apt-get install -yqq libshiboken2-dev libxmu-dev lm-sensors protobuf-compiler +RUN apt-get install -yqq python3-cairo python3-cairosvg python3-click python3-colorama python3-coverage python3-imageio python3-joblib python3-matplotlib python3-mock python3-nose python3-opencv python3-progressbar python3-psutil python3-pydot python3-pygraphviz +# python-pil python3-catkin-pkg-modules +RUN apt-get install -yqq python3-pyproj python3-pyqt5.qtsvg python3-pyside2.qtsvg python3-scipy python3-serial python3-shapely python3-skimage python3-sklearn python3-tabulate python3-texttable python3-tornado python3-websocket +# python3-rosdep python3-rosdep-modules python3-rospkg-modules +RUN apt-get install -yqq qt5-image-formats-plugins shiboken2 sysstat tango-icon-theme virtualenv + +RUN apt-get install -yqq libpyside2-dev +RUN apt-get install -yqq python3-sip-dev +RUN apt-get install -yqq pyqt5-dev + ENV DEST=/opt/ros/base RUN mkdir $DEST -p ENV SRC=/opt/src @@ -112,16 +130,15 @@ RUN catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-depreca # RUN catkin build --no-status -j1 fuse_core # disabling this because it is too slow to build # RUN catkin build --no-status -j1 rtabmap_ros -RUN apt-get install -yqq libpyside2-dev -RUN apt-get install -yqq python3-sip-dev -RUN apt-get install -yqq pyqt5-dev +RUN rosdep update +RUN rosdep install --from-paths src --ignore-src -r -s || true +RUN catkin build --no-status -j1 libuvc_camera RUN catkin build --no-status -j1 rqt RUN catkin build --no-status -j1 vdb_mapping* RUN catkin build --no-status -j1 jsk_rviz_plugins RUN catkin build --no-status -j1 rviz RUN catkin build --no-status -j1 plotjuggler RUN catkin build --no-status -j1 octomap_server -RUN catkin build --no-status -j1 libuvc_camera # RUN catkin build --no-status -j1 fuse_constraints RUN catkin build --no-status -j1 people_tracking_filter RUN catkin build --no-status -j1 laser_assembler diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index 371fdf3..65e9618 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -273,8 +273,8 @@ repositories: version: master other/lvr2: type: git - url: git@github.com:lucasw/lvr2 - version: ros1_or_2 + url: git@github.com:uos/lvr2 + version: humble other/marti_messages: type: git url: git@github.com:swri-robotics/marti_messages.git @@ -498,7 +498,7 @@ repositories: ros/libuvc_ros: type: git url: git@github.com:lucasw/libuvc_ros.git - version: boost_placeholders + version: libuvc_0_0_7 ros/media_export: type: git url: git@github.com:ros/media_export.git From 93fe24a5db9d3030437fc578e16548a6a7019212 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 16 Apr 2024 16:21:39 -0700 Subject: [PATCH 08/76] getting further with 24.04 building but fuse is failing --- ubuntu_2404/Dockerfile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ubuntu_2404/Dockerfile b/ubuntu_2404/Dockerfile index ff85861..41698cf 100644 --- a/ubuntu_2404/Dockerfile +++ b/ubuntu_2404/Dockerfile @@ -143,13 +143,24 @@ RUN catkin build --no-status -j1 octomap_server RUN catkin build --no-status -j1 people_tracking_filter RUN catkin build --no-status -j1 laser_assembler RUN catkin build --no-status -j1 catkin_virtualenv -RUN catkin build --no-status -j1 nmea_navsat_driver +# RUN catkin build --no-status -j1 nmea_navsat_driver RUN catkin build --no-status -j1 grid_map_visualization RUN catkin build --no-status -j1 stereo_image_proc RUN catkin build --no-status -j1 jsk_topic_tools RUN catkin build --no-status -j1 jsk_interactive_marker # RUN catkin build --no-status -j1 test_catkin_virtualenv_inherited # RUN catkin build --no-status -j1 test_catkin_virtualenv_py3_isolated +# the navsat tests are broken +RUN catkin build --no-status -j1 nmea_navsat_driver --cmake-args -DCATKIN_ENABLE_TESTING=False +RUN catkin build --no-status -j1 lvr2 +RUN catkin build --no-status -j1 ros_type_introspection +RUN catkin build --no-status -j1 actionlib_tutorials +RUN catkin build --no-status -j1 rospack +RUN catkin build --no-status -j1 libnabo +RUN catkin build --no-status -j1 rqt* +RUN catkin build --no-status -j1 jsk* +RUN catkin build --no-status -j1 rtabmap* +RUN catkin build --no-status -j1 fuse* RUN catkin build --no-status -j1 # rospack list won't work by itself From 0298e4cc4384da8782305b7ebe7ce94d58b60f7f Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 16 Apr 2024 21:39:46 -0700 Subject: [PATCH 09/76] skipping apriltag for now, can build rtabmap but need to fix fuse --- ubuntu_2404/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ubuntu_2404/Dockerfile b/ubuntu_2404/Dockerfile index 41698cf..ebd028f 100644 --- a/ubuntu_2404/Dockerfile +++ b/ubuntu_2404/Dockerfile @@ -159,6 +159,12 @@ RUN catkin build --no-status -j1 rospack RUN catkin build --no-status -j1 libnabo RUN catkin build --no-status -j1 rqt* RUN catkin build --no-status -j1 jsk* +RUN apt-get install -yqq vim +RUN apt-get install -yqq libapriltag-dev +# there's a bug with libapriltag-dev 3.3.0-2.1build1, could patch but skip for now +# probably they'll update it soon? +# RUN catkin build --no-status -j1 apriltag_ros +RUN touch src/other/apriltag_ros/CATKIN_IGNORE RUN catkin build --no-status -j1 rtabmap* RUN catkin build --no-status -j1 fuse* RUN catkin build --no-status -j1 From 5a6241039969477f8d37b02f1dee474de0ad4df1 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 17 Apr 2024 08:15:58 -0700 Subject: [PATCH 10/76] now building fuse and rosmon, have some temporary git pulls and an apt update/upgrade to clean out later --- ubuntu_2404/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ubuntu_2404/Dockerfile b/ubuntu_2404/Dockerfile index ebd028f..f86ae50 100644 --- a/ubuntu_2404/Dockerfile +++ b/ubuntu_2404/Dockerfile @@ -166,7 +166,15 @@ RUN apt-get install -yqq libapriltag-dev # RUN catkin build --no-status -j1 apriltag_ros RUN touch src/other/apriltag_ros/CATKIN_IGNORE RUN catkin build --no-status -j1 rtabmap* +RUN apt-get update -yqq +RUN apt-get upgrade -yqq +RUN dpkg -l | grep ceres +RUN dpkg -l | grep apriltag +RUN cd src/other/fuse && ls -l && git fetch && git reset --hard origin/cpp17 && git show +RUN catkin build --no-status -j1 fuse_viz RUN catkin build --no-status -j1 fuse* +RUN cd src/other/rosmon && git fetch && git reset --hard origin/build_2204 && git show && ls -l +RUN catkin build --no-status -j1 rosmon* RUN catkin build --no-status -j1 # rospack list won't work by itself From 33c053c360ceb53f79d2178ecbfab027da270a46 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sat, 20 Apr 2024 08:19:42 -0700 Subject: [PATCH 11/76] can now get through the 24.04 build, cleaned up some temporary Dockefile run commands --- ubuntu_2404/Dockerfile | 20 ++++++++++---------- ubuntu_2404/base_repos.yaml | 3 ++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ubuntu_2404/Dockerfile b/ubuntu_2404/Dockerfile index f86ae50..01334df 100644 --- a/ubuntu_2404/Dockerfile +++ b/ubuntu_2404/Dockerfile @@ -68,6 +68,9 @@ RUN apt-get install -yqq libpyside2-dev RUN apt-get install -yqq python3-sip-dev RUN apt-get install -yqq pyqt5-dev +RUN apt-get install -yqq libapriltag-dev +RUN apt-get install -yqq vim + ENV DEST=/opt/ros/base RUN mkdir $DEST -p ENV SRC=/opt/src @@ -137,9 +140,8 @@ RUN catkin build --no-status -j1 rqt RUN catkin build --no-status -j1 vdb_mapping* RUN catkin build --no-status -j1 jsk_rviz_plugins RUN catkin build --no-status -j1 rviz -RUN catkin build --no-status -j1 plotjuggler +RUN catkin build --no-status -j1 plotjuggler* RUN catkin build --no-status -j1 octomap_server -# RUN catkin build --no-status -j1 fuse_constraints RUN catkin build --no-status -j1 people_tracking_filter RUN catkin build --no-status -j1 laser_assembler RUN catkin build --no-status -j1 catkin_virtualenv @@ -159,22 +161,20 @@ RUN catkin build --no-status -j1 rospack RUN catkin build --no-status -j1 libnabo RUN catkin build --no-status -j1 rqt* RUN catkin build --no-status -j1 jsk* -RUN apt-get install -yqq vim -RUN apt-get install -yqq libapriltag-dev # there's a bug with libapriltag-dev 3.3.0-2.1build1, could patch but skip for now # probably they'll update it soon? # RUN catkin build --no-status -j1 apriltag_ros RUN touch src/other/apriltag_ros/CATKIN_IGNORE RUN catkin build --no-status -j1 rtabmap* -RUN apt-get update -yqq -RUN apt-get upgrade -yqq -RUN dpkg -l | grep ceres -RUN dpkg -l | grep apriltag -RUN cd src/other/fuse && ls -l && git fetch && git reset --hard origin/cpp17 && git show RUN catkin build --no-status -j1 fuse_viz RUN catkin build --no-status -j1 fuse* -RUN cd src/other/rosmon && git fetch && git reset --hard origin/build_2204 && git show && ls -l RUN catkin build --no-status -j1 rosmon* +RUN catkin build --no-status -j1 grid_map* +RUN catkin build --no-status -j1 rviz* +RUN catkin build --no-status -j1 octomap* +RUN catkin build --no-status -j1 opencv_apps +RUN catkin build --no-status -j1 aruco* +RUN catkin build --no-status -j1 vimjay RUN catkin build --no-status -j1 # rospack list won't work by itself diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index 65e9618..722ce03 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -165,7 +165,8 @@ repositories: version: eliminate_build_warnings opencv_apps: type: git - url: git@github.com:ros-perception/opencv_apps.git + # url: git@github.com:ros-perception/opencv_apps.git + url: git@github.com:muellerbernd/opencv_apps version: indigo other/PlotJuggler: type: git From 656dabbfc9a4e25c54a07b027275dda0f2b483e6 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sat, 27 Apr 2024 18:06:42 -0700 Subject: [PATCH 12/76] can use main catkin_tools now --- ubuntu_2204/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu_2204/Dockerfile b/ubuntu_2204/Dockerfile index 7247eab..f4abef1 100644 --- a/ubuntu_2204/Dockerfile +++ b/ubuntu_2204/Dockerfile @@ -40,7 +40,7 @@ RUN ls -l RUN python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed WORKDIR $SRC -RUN git clone https://github.com/lucasw/catkin_tools.git --branch sanitize_cmake_prefix_path +RUN git clone https://github.com/catkin/catkin_tools.git WORKDIR $SRC/catkin_tools RUN python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed From a4cc61f759addc26c8134c79dda039bbca34f160 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Mon, 29 Apr 2024 14:13:17 -0700 Subject: [PATCH 13/76] need to use noetic branch of wu_ros_tools --- ubuntu_2404/base_repos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index 722ce03..fba1977 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -411,7 +411,7 @@ repositories: other/wu_ros_tools: type: git url: git@github.com:lucasw/wu_ros_tools - version: kinetic + version: noetic ros/async_web_server_cpp: type: git url: git@github.com:lucasw/async_web_server_cpp.git From 65627590334ffd841b8db13c8cbf1635e3e5556e Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 30 Apr 2024 11:55:27 -0700 Subject: [PATCH 14/76] use updated rosboard --- ubuntu_2404/base_repos.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index fba1977..b3197a9 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -358,8 +358,8 @@ repositories: version: main other/rosboard: type: git - url: git@github.com:dheera/rosboard.git - version: main + url: git@github.com:lucasw/rosboard.git + version: patch-1 other/rosfmt: type: git url: git@github.com:lucasw/rosfmt From 53cc173c030d05df70554f8685e4a4652fd9e236 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 30 Apr 2024 11:55:54 -0700 Subject: [PATCH 15/76] updating build instructions to work with ubuntu 24.04- not sure how backwards compatible the python path changes are --- build.sh | 10 ++++++---- env.sh | 13 +++++++++++++ git_clone.sh | 6 +++--- 3 files changed, 22 insertions(+), 7 deletions(-) create mode 100755 env.sh diff --git a/build.sh b/build.sh index 170c64b..8f3ac42 100755 --- a/build.sh +++ b/build.sh @@ -24,7 +24,8 @@ python --version | awk '{print $2}' | cut -d'.' -f1 # TODO(lucasw) these aren't working PYTHON_MAJOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f1` PYTHON_MINOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f2` -OPT_PYTHONPATH=$DEST/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/site-packages/ +OPT_PYTHONPATH=$DEST/local/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/dist-packages/ +mkdir -p $OPT_PYTHONPATH echo $PYTHONPATH export PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH echo PYTHONPATH=\$PYTHONPATH:$OPT_PYTHONPATH @@ -33,7 +34,7 @@ echo PYTHONPATH=\$PYTHONPATH:$OPT_PYTHONPATH cd $SRC/catkin_pkg python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed ls -l $OPT_PYTHONPATH -ls -l $OPT_PYTHONPATH/catkin_pkg +ls -l $OPT_PYTHONPATH/catkin_pkg* # python -c "import sys; print(sys.path)" python -c "import catkin_pkg; print(catkin_pkg.__version__)" python -c "from catkin_pkg.package import parse_package" @@ -55,6 +56,7 @@ cmake $WS/catkin -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST - python -c "import catkin; print(catkin)" ls -l $DEST/bin PATH=$PATH:$DEST/bin +PATH=$PATH:$DEST/local/bin # console_bridge mkdir -p $BUILD/console_bridge @@ -144,7 +146,7 @@ rosdep update cd $WS/.. catkin init source $DEST/setup.bash -catkin config +catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -DCATKIN_ENABLE_TESTING=False rospack list # rosdep install --from-paths src --ignore-src -r -s # do a dry-run first @@ -154,7 +156,7 @@ echo $CMAKE_PREFIX_PATH # TODO(lucasw) put this in WS to begin with # TODO(lucasw) was this needed? Need a bunch of CATKIN_IGNOREs in every package/test dir to make it build # ln -s $SRC/ros $WS/ros -catkin build --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated +catkin build source devel/setup.bash rospack list # TODO(lucasw) run tests diff --git a/env.sh b/env.sh new file mode 100755 index 0000000..af06bdd --- /dev/null +++ b/env.sh @@ -0,0 +1,13 @@ +#!/usr/bin/bash +# source ros_from_src/env.sh +export ROS_DEST=`pwd`/ros +export PATH=$PATH:$ROS_DEST/bin +export PATH=$PATH:$ROS_DEST/local/bin + +PYTHON_MAJOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f1` +PYTHON_MINOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f2` +OPT_PYTHONPATH=$ROS_DEST/local/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/dist-packages/ + +export PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH +export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$ROS_DEST:$ROS_DEST/lib/cmake + diff --git a/git_clone.sh b/git_clone.sh index ebcb3e9..7758e0b 100755 --- a/git_clone.sh +++ b/git_clone.sh @@ -19,11 +19,11 @@ git clone https://github.com/ros/rospack git clone https://github.com/ros/genmsg # ros packages, regular catkin build only for these -git clone https://github.com/ros/ros_comm -git clone https://github.com/ros/roscpp_core +git clone https://github.com/ros-o/ros_comm +git clone https://github.com/ros-o/roscpp_core git clone https://github.com/ros/ros_comm_msgs git clone https://github.com/ros/message_generation -git clone https://github.com/ros/gencpp +git clone https://github.com/ros-o/gencpp git clone https://github.com/jsk-ros-pkg/geneus git clone https://github.com/RethinkRobotics-opensource/gennodejs git clone https://github.com/ros/genlisp From 7b5548d9c707e82b5a17ab1951bf42de9d14a657 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 31 May 2024 09:32:45 -0700 Subject: [PATCH 16/76] use looping time fix in nodelet_core --- ubuntu_2204/base_repos.yaml | 4 ++++ ubuntu_2404/base_repos.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ubuntu_2204/base_repos.yaml b/ubuntu_2204/base_repos.yaml index 5f41763..11c98fa 100644 --- a/ubuntu_2204/base_repos.yaml +++ b/ubuntu_2204/base_repos.yaml @@ -507,6 +507,10 @@ repositories: type: git url: git@github.com:ros-drivers/nmea_msgs version: master + ros/nodelet_core: + type: git + url: git@github.com:lucasw/nodelet_core.git + version: throttle_looping_time ros/octomap_msgs: type: git url: git@github.com:OctoMap/octomap_msgs.git diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index b3197a9..9818472 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -512,6 +512,10 @@ repositories: type: git url: git@github.com:ros-drivers/nmea_msgs version: master + ros/nodelet_core: + type: git + url: git@github.com:lucasw/nodelet_core.git + version: throttle_looping_time ros/octomap_msgs: type: git url: git@github.com:OctoMap/octomap_msgs.git From de7c7664504593ca857eea63cea54776d4b89823 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 9 Jun 2024 07:40:30 -0700 Subject: [PATCH 17/76] show how to set enable testing false --- ubuntu_2404/README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 ubuntu_2404/README.md diff --git a/ubuntu_2404/README.md b/ubuntu_2404/README.md new file mode 100644 index 0000000..184d689 --- /dev/null +++ b/ubuntu_2404/README.md @@ -0,0 +1,18 @@ + + + +Some packages (like jsk_recognition_msgs) expect ROS_DISTRO to exist, so: + +``` +export ROS_DISTRO=one +``` + + +``` +catkin config --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -DCATKIN_ENABLE_TESTING=False +``` + + +``` +catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -DCATKIN_ENABLE_TESTING=False +``` From 402ba9f93adc877ad879474c0daa0d44faf91669 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 9 Jun 2024 07:42:53 -0700 Subject: [PATCH 18/76] build 24.04 docker container in a 22.04 action --- .github/workflows/ubuntu_24_04.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/ubuntu_24_04.yaml diff --git a/.github/workflows/ubuntu_24_04.yaml b/.github/workflows/ubuntu_24_04.yaml new file mode 100644 index 0000000..4a2b13b --- /dev/null +++ b/.github/workflows/ubuntu_24_04.yaml @@ -0,0 +1,21 @@ +name: Ubuntu 20.04 Noetic ROS build from source + +on: + push: + workflow_dispatch: + +jobs: + ubuntu2404dockeron2204: + runs-on: ubuntu-22.04 + # env: + steps: + - name: git clone git@github.com:lucasw/ros_from_src + uses: actions/checkout@v4 + with: + path: ros_from_src + submodules: recursive + + - name: docker build from source 24.04 + run: | + cd ros_from_src + docker build --build-arg IMAGE=ubuntu:24.04 --build-arg PYTHON_MINOR_VERSION=10 . -t ros2404 From 1a1e4ec46cf0c55038f9aeffbaa502ef97580baa Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 9 Jun 2024 08:42:26 -0700 Subject: [PATCH 19/76] can't install python3-rosunit in 24.04 --- dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.sh b/dependencies.sh index f207f8c..17e337f 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -39,4 +39,4 @@ apt-get install -y python3-pycryptodome apt-get install -y python3-gnupg # TODO(lucasw) get this from source later -apt-get install -y python3-rosunit +# apt-get install -y python3-rosunit From 20d19477e53148db0262831f08a4594a90fef1ed Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 9 Jun 2024 08:42:57 -0700 Subject: [PATCH 20/76] look in either packages location for catkin_pkg --- build.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/build.sh b/build.sh index 8f3ac42..d24e48c 100755 --- a/build.sh +++ b/build.sh @@ -24,17 +24,22 @@ python --version | awk '{print $2}' | cut -d'.' -f1 # TODO(lucasw) these aren't working PYTHON_MAJOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f1` PYTHON_MINOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f2` -OPT_PYTHONPATH=$DEST/local/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/dist-packages/ -mkdir -p $OPT_PYTHONPATH -echo $PYTHONPATH -export PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH -echo PYTHONPATH=\$PYTHONPATH:$OPT_PYTHONPATH +# ubuntu 20.04? +OPT_PYTHONPATH0=$DEST/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/site-packages/ +mkdir -p $OPT_PYTHONPATH0 +echo $PYTHONPATH0 +# ubuntu 24.04 and 22.04? +OPT_PYTHONPATH1=$DEST/local/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/dist-packages/ +mkdir -p $OPT_PYTHONPATH1 +echo $PYTHONPATH1 +export PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH0:$OPT_PYTHONPATH1 +echo PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH0:$OPT_PYTHONPATH1 # catkin_pkg cd $SRC/catkin_pkg python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed -ls -l $OPT_PYTHONPATH -ls -l $OPT_PYTHONPATH/catkin_pkg* +ls -l $OPT_PYTHONPATH0 || ls -l $OPT_PYTHONPATH1 +ls -l $OPT_PYTHONPATH0/catkin_pkg* || ls -l $OPT_PYTHONPATH1/catkin_pkg* # python -c "import sys; print(sys.path)" python -c "import catkin_pkg; print(catkin_pkg.__version__)" python -c "from catkin_pkg.package import parse_package" From b08bb53c9ef890be6931d4af47c675266ad7a6a9 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 9 Jun 2024 08:43:31 -0700 Subject: [PATCH 21/76] ignore more in 24.04 --- ubuntu_2404/ignore.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ubuntu_2404/ignore.sh b/ubuntu_2404/ignore.sh index f3a2456..67222f0 100755 --- a/ubuntu_2404/ignore.sh +++ b/ubuntu_2404/ignore.sh @@ -7,7 +7,9 @@ touch ./clearpath/moose_simulator/CATKIN_IGNORE touch ./clearpath/warthog_simulator/CATKIN_IGNORE touch ./greenzie/boustrophedon_planner/CATKIN_IGNORE touch ./other/anybotics/elevation_mapping/CATKIN_IGNORE +touch ./other/apriltag_ros/CATKIN_IGNORE # libapriltag-dev lib/lib cmake issue touch ./other/catkin_virtualenv/test_catkin_virtualenv/CATKIN_IGNORE +touch ./other/catkin_virtualenv/test_catkin_virtualenv_inherited/CATKIN_IGNORE # touch ./other/catkin_virtualenv/test_catkin_virtualenv_python2/CATKIN_IGNORE touch ./other/depthai-ros-examples/CATKIN_IGNORE touch ./other/ffmpeg_image_transport/CATKIN_IGNORE From e24f306b2519e19c4ae6ded78fd0db02a04963de Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 9 Jun 2024 08:45:09 -0700 Subject: [PATCH 22/76] comment about ubunut_2404/Dockerfile not currently working --- .github/workflows/ubuntu_24_04.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_24_04.yaml b/.github/workflows/ubuntu_24_04.yaml index 4a2b13b..438db5a 100644 --- a/.github/workflows/ubuntu_24_04.yaml +++ b/.github/workflows/ubuntu_24_04.yaml @@ -1,4 +1,4 @@ -name: Ubuntu 20.04 Noetic ROS build from source +name: Ubuntu 24.04 Noetic ROS build from source in docker on: push: @@ -19,3 +19,6 @@ jobs: run: | cd ros_from_src docker build --build-arg IMAGE=ubuntu:24.04 --build-arg PYTHON_MINOR_VERSION=10 . -t ros2404 + + # TODO(lucasw) ubuntu_2404/Dockerfile doesn't work, was depending on the now-removed + # apt debian science ros packages From d2bfbd81bf3473dca9f96e7bd0728eb79d02eab2 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 9 Jun 2024 08:45:51 -0700 Subject: [PATCH 23/76] use build.sh in dockerfile so don't have to maintain same process in multiple places --- Dockerfile | 177 ++--------------------------------------------------- 1 file changed, 6 insertions(+), 171 deletions(-) diff --git a/Dockerfile b/Dockerfile index c69f55d..b78b527 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,22 +9,8 @@ ENV DEBIAN_FRONTEND="noninteractive" RUN rm /bin/sh && ln -s /bin/bash /bin/sh RUN apt-get update -RUN apt-get install -y apt-utils - -# apt installs -# TODO(lucasw) used to do these on separate layers but github actions has a layer limit? -# it was failing later with 'ERROR: failed to solve: failed to prepare...max depth exceeded' -RUN apt-get install -y build-essential bzip2 libbz2-dev cmake git libboost-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev libboost-thread-dev libfmt-dev libgpgme-dev libgtest-dev liblog4cxx-dev liblz4-dev lz4 libpoco-dev libtinyxml2-dev mawk coreutils python-is-python3 python3 python3-dev python3-empy python3-setuptools python3-yaml -RUN apt-get update && apt-get install -yqq libgsl-dev wget libspnav-dev liburdfdom-dev libyaml-cpp-dev cython3 freeglut3-dev libapriltag-dev libcgal-dev libhdf5-dev libturbojpeg0-dev libzmq3-dev ocl-icd-opencl-dev opencl-headers - -ENV SRC=/src -RUN mkdir $SRC -p -ENV BUILD=/build -RUN mkdir $BUILD -p -ENV WS=/catkin_ws/src -RUN mkdir $WS -p - -ENV DEST=/opt/ros/noetic +RUN apt-get install -yqq apt-utils +RUN apt-get install -yqq git # TODO(lucasw) this doesn't work in 20.04 because of log # --build-args ROSCONSOLE=https://github.com/ros-o/rosconsole @@ -39,162 +25,11 @@ COPY git_clone.sh $SRC/ros_from_src # WORKDIR $SRC/ros_from_src RUN ROS_CONSOLE=$ROSCONSOLE $SRC/ros_from_src/git_clone.sh -# python installs - -RUN python --version | awk '{print $2}' | cut -d'.' -f1 -RUN python --version | awk '{print $2}' | cut -d'.' -f2 -# TODO(lucasw) these aren't working -# RUN export PYTHON_MAJOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f1` -# RUN export PYTHON_MINOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f2` -# RUN PYTHON_MINOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f2` -ARG PYTHON_MAJOR_VERSION=3 -ARG PYTHON_MINOR_VERSION=10 -ENV OPT_PYTHONPATH=$DEST/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/site-packages/ -RUN echo $PYTHONPATH -ENV PYTHONPATH=$OPT_PYTHONPATH -RUN echo $PYTHONPATH - -# catkin_pkg -WORKDIR $SRC/catkin_pkg -RUN pwd -RUN python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed -RUN ls -l $OPT_PYTHONPATH -RUN ls -l $OPT_PYTHONPATH/catkin_pkg -# RUN python -c "import sys; print(sys.path)" -RUN python -c "import catkin_pkg; print(catkin_pkg.__version__)" -RUN apt-get install -y python3-pyparsing -RUN python -c "from catkin_pkg.package import parse_package" - -# osrf pycommon -WORKDIR $SRC/osrf_pycommon -# TODO(lucasw) install to $DEST -RUN python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed - -# catkin tools -WORKDIR $SRC/catkin_tools -RUN python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed - -# cmake install -RUN mkdir $BUILD/catkin -p -WORKDIR $BUILD/catkin -RUN cmake $WS/catkin -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF -DCATKIN_INSTALL_INTO_PREFIX_ROOT=true && make && make install -RUN python -c "import catkin; print(catkin)" -RUN ls -l $DEST/bin -ENV PATH=$PATH:$DEST/bin - -# console_bridge -RUN mkdir $BUILD/console_bridge -p -WORKDIR $BUILD/console_bridge -# RUN cmake ../../console_bridge -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib && make && make install -RUN cmake $WS/console_bridge -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DEST -DCMAKE_INSTALL_LIBDIR=lib -RUN make -RUN make install - -# cmake_modules -WORKDIR $WS -RUN mkdir $BUILD/cmake_modules -p -RUN ls -l $DEST/lib -WORKDIR $BUILD/cmake_modules -RUN cmake $WS/cmake_modules -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF -RUN make -RUN make install - -# class_loader -RUN mkdir $BUILD/class_loader -p -RUN export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$DEST:$DEST/lib/cmake -RUN ls -l $DEST -RUN ls -l $DEST/share/cmake_modules/cmake/ -WORKDIR $BUILD/class_loader -RUN cmake $WS/class_loader -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF -Dcmake_modules_DIR=$DEST/share/cmake_modules/cmake/ -RUN make -RUN make install - -# ros_environment -RUN mkdir $BUILD/ros_environment -p -RUN pwd -WORKDIR $BUILD/ros_environment -RUN cmake $SRC/ros_environment -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF -RUN make -RUN make install - -# ros_pack -RUN mkdir $BUILD/rospack -p -WORKDIR $BUILD/rospack -RUN cmake $WS/rospack -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF -Dcmake_modules_DIR=$DEST/share/cmake_modules/cmake/ -RUN make -RUN make install - -# genmsg -RUN mkdir $BUILD/genmsg -p -WORKDIR $BUILD/genmsg -RUN cmake $WS/genmsg -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF -RUN make -RUN make install - -# roslib -RUN mkdir $BUILD/roslib -p -WORKDIR $BUILD/roslib -RUN cmake $WS/ros/core/roslib -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF -Drospack_DIR=$DEST/share/rospack/cmake/ -RUN make -RUN make install - -# rosbuild -RUN mkdir $BUILD/rosbuild -p -WORKDIR $BUILD/rosbuild -RUN cmake $WS/ros/core/rosbuild -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF # -Drospack_DIR=$DEST/share/rospack/cmake/ -RUN make -RUN make install - -RUN apt-get update -RUN apt-get install -y python3-dateutil -RUN apt-get install -y python3-docutils -RUN export PATH=$PATH:/usr/local/bin -RUN catkin --help - -RUN apt-get install -y python3-defusedxml -RUN apt-get install -y python3-distro - -# ros packages, regular catkin build only for these -WORKDIR $WS - - -# runtime dependencies -# rosbuild -WORKDIR $SRC/rospkg -RUN python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed - -WORKDIR $SRC/rosdistro -RUN python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed - -# can be sudo in docker, but otherwise want git clone https://github.com/lucasw/rosdep --branch disable_root_etc_ros -WORKDIR $SRC/rosdep -RUN python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed -RUN rosdep init -# ERROR: unable to process source [https://raw.githubusercontent.com/ros/rosdistro/master/rosdep/base.yaml]: -RUN rosdep update || true - -# TODO(lucasw) already have a copy of this but needs to be in the workspace -# RUN find / | grep setup.bash -# RUN find / | grep catkin-config.cmake -WORKDIR $WS/.. -RUN source $DEST/setup.bash -RUN catkin init -RUN source $DEST/setup.bash && catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -# rospack list won't work by itself -RUN source $DEST/setup.bash && rospack list - -# regular catkin build -# RUN rosdep install --from-paths src --ignore-src -r -s # do a dry-run first -# RUN rosdep install --from-paths src --ignore-src -r -y -ENV CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$DEST:$DEST/lib/cmake -RUN echo $CMAKE_PREFIX_PATH -# TODO(lucasw) put this in WS to begin with -RUN echo $ROS_PACKAGE_PATH -RUN catkin build -# rospack list won't work by itself -RUN source install/setup.bash && rospack list +COPY dependencies.sh $SRC/ros_from_src +RUN $SRC/ros_from_src/dependencies.sh -RUN apt-get install python3-netifaces +COPY build.sh $SRC/ros_from_src +RUN $SRC/ros_from_src/build.sh WORKDIR $WS/.. # TODO(lucasw) run tests From 482bdc80ba5da2722d1a2bfdb668412039ef9f45 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 14 Jul 2024 18:26:28 -0700 Subject: [PATCH 24/76] interim checkin to make setting up a new 24.04 ros one install easier --- Dockerfile | 12 +++-- build.sh | 23 +-------- catkin.sh | 18 +++++++ dependencies.sh | 4 ++ env.sh | 13 +++-- git_clone.sh | 30 ++---------- underlay_repos.yaml | 117 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 163 insertions(+), 54 deletions(-) create mode 100755 catkin.sh create mode 100644 underlay_repos.yaml diff --git a/Dockerfile b/Dockerfile index b78b527..5110dbf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,15 +21,21 @@ RUN echo $ROSCONSOLE # packages that need to be cmake installed, and are ros packages in a catkin workspace RUN mkdir $SRC/ros_from_src -p WORKDIR / -COPY git_clone.sh $SRC/ros_from_src -# WORKDIR $SRC/ros_from_src -RUN ROS_CONSOLE=$ROSCONSOLE $SRC/ros_from_src/git_clone.sh COPY dependencies.sh $SRC/ros_from_src RUN $SRC/ros_from_src/dependencies.sh +# WORKDIR $SRC/ros_from_src +COPY underlay_repos.yaml $SRC/ros_from_src +COPY git_clone.sh $SRC/ros_from_src +RUN ROS_CONSOLE=$ROSCONSOLE $SRC/ros_from_src/git_clone.sh + COPY build.sh $SRC/ros_from_src RUN $SRC/ros_from_src/build.sh +COPY env.sh $SRC/ros_from_src +COPY catkin.sh $SRC/ros_from_src +RUN $SRC/ros_from_src/catkin.sh + WORKDIR $WS/.. # TODO(lucasw) run tests diff --git a/build.sh b/build.sh index d24e48c..820811e 100755 --- a/build.sh +++ b/build.sh @@ -12,10 +12,6 @@ BUILD=`pwd`/build echo $BUILD mkdir -p $BUILD -WS=`pwd`/catkin_ws/src -echo $WS -mkdir -p $WS || true - DEST=`pwd`/ros # python installs @@ -148,20 +144,5 @@ rosdep update # TODO(lucasw) already have a copy of this but needs to be in the workspace # find / | grep setup.bash # find / | grep catkin-config.cmake -cd $WS/.. -catkin init -source $DEST/setup.bash -catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -DCATKIN_ENABLE_TESTING=False -rospack list - -# rosdep install --from-paths src --ignore-src -r -s # do a dry-run first -# rosdep install --from-paths src --ignore-src -r -y -CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$DEST:$DEST/lib/cmake -echo $CMAKE_PREFIX_PATH -# TODO(lucasw) put this in WS to begin with -# TODO(lucasw) was this needed? Need a bunch of CATKIN_IGNOREs in every package/test dir to make it build -# ln -s $SRC/ros $WS/ros -catkin build -source devel/setup.bash -rospack list -# TODO(lucasw) run tests + + diff --git a/catkin.sh b/catkin.sh new file mode 100755 index 0000000..0075abb --- /dev/null +++ b/catkin.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +source env.sh + +WS=`pwd`/underlay_ws/src +echo $WS + +cd $WS/.. +echo "#####################" +pwd +catkin init +catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -DCATKIN_ENABLE_TESTING=False +rospack list + +catkin build +source devel/setup.bash +rospack list +# TODO(lucasw) run tests diff --git a/dependencies.sh b/dependencies.sh index 17e337f..aae9ef6 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -18,6 +18,7 @@ apt-get install -y libgtest-dev apt-get install -y liblog4cxx-dev apt-get install -y liblz4-dev lz4 apt-get install -y libpoco-dev +apt-get install -y libtinyxml-dev apt-get install -y libtinyxml2-dev apt-get install -y mawk apt-get install -y python-is-python3 @@ -40,3 +41,6 @@ apt-get install -y python3-gnupg # TODO(lucasw) get this from source later # apt-get install -y python3-rosunit + +apt-get install -y catkin-tools +apt-get install -y vcstool diff --git a/env.sh b/env.sh index af06bdd..18aa48a 100755 --- a/env.sh +++ b/env.sh @@ -1,13 +1,16 @@ #!/usr/bin/bash # source ros_from_src/env.sh export ROS_DEST=`pwd`/ros -export PATH=$PATH:$ROS_DEST/bin -export PATH=$PATH:$ROS_DEST/local/bin +# export PATH=$PATH:$ROS_DEST/bin +# export PATH=$PATH:$ROS_DEST/local/bin +# python --version | awk '{print $2}' | cut -d'.' -f1 PYTHON_MAJOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f1` PYTHON_MINOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f2` -OPT_PYTHONPATH=$ROS_DEST/local/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/dist-packages/ +OPT_PYTHONPATH0=$ROS_DEST/local/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/site-packages/ +OPT_PYTHONPATH1=$ROS_DEST/local/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/dist-packages/ -export PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH +export PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH0:$OPT_PYTHONPATH1 +echo "PYTHONPATH $PYTHONPATH" export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$ROS_DEST:$ROS_DEST/lib/cmake - +echo "CMAKE_PREFIXPATH $CMAKE_PREFIX_PATH" diff --git a/git_clone.sh b/git_clone.sh index 7758e0b..97b7308 100755 --- a/git_clone.sh +++ b/git_clone.sh @@ -4,37 +4,18 @@ SRC=`pwd`/src echo $SRC mkdir $SRC -p -WS=`pwd`/catkin_ws/src + +WS=`pwd`/underlay_ws/src echo $WS mkdir $WS -p # TODO(lucasw) replace these git clones with vcs # packages that need to be cmake installed, and are ros packages in a catkin workspace cd $WS -git clone https://github.com/ros/catkin -git clone https://github.com/ros/console_bridge -git clone https://github.com/ros/cmake_modules -git clone https://github.com/ros-o/class_loader -git clone https://github.com/ros/rospack -git clone https://github.com/ros/genmsg - -# ros packages, regular catkin build only for these -git clone https://github.com/ros-o/ros_comm -git clone https://github.com/ros-o/roscpp_core -git clone https://github.com/ros/ros_comm_msgs -git clone https://github.com/ros/message_generation -git clone https://github.com/ros-o/gencpp -git clone https://github.com/jsk-ros-pkg/geneus -git clone https://github.com/RethinkRobotics-opensource/gennodejs -git clone https://github.com/ros/genlisp -git clone https://github.com/ros/genpy -git clone https://github.com/ros/std_msgs -git clone https://github.com/ros/message_runtime -git clone https://github.com/ros-o/pluginlib -git clone https://github.com/ros/ros +vcs import --input underlay_repos.yaml -ROSCONSOLE1=${ROSCONSOLE:-https://github.com/ros-o/rosconsole} -git clone $ROSCONSOLE1 +# ROSCONSOLE1=${ROSCONSOLE:-https://github.com/ros-o/rosconsole} +# git clone $ROSCONSOLE1 # pure python cd $SRC @@ -45,7 +26,6 @@ git clone https://github.com/catkin/catkin_tools # cmake installs git clone https://github.com/ros-o/ros_environment - # runtime git clone https://github.com/ros-infrastructure/rospkg git clone https://github.com/ros-infrastructure/rosdistro diff --git a/underlay_repos.yaml b/underlay_repos.yaml new file mode 100644 index 0000000..6084939 --- /dev/null +++ b/underlay_repos.yaml @@ -0,0 +1,117 @@ +repositories: + actionlib: + type: git + url: git@github.com:ros/actionlib.git + version: noetic-devel + angles: + type: git + url: git@github.com:ros/angles.git + version: master + bond_core: + type: git + url: git@github.com:ros-o/bond_core.git + version: obese-devel + catkin: + type: git + url: https://github.com/ros/catkin + version: noetic-devel + class_loader: + type: git + url: https://github.com/ros-o/class_loader + version: obese-devel + cmake_modules: + type: git + url: https://github.com/ros/cmake_modules + version: 0.5-devel + console_bridge: + type: git + url: https://github.com/ros/console_bridge + version: master + gencpp: + type: git + url: https://github.com/ros-o/gencpp + version: obese-devel + geneus: + type: git + url: https://github.com/jsk-ros-pkg/geneus + version: master + genlisp: + type: git + url: https://github.com/ros/genlisp + version: kinetic-devel + genmsg: + type: git + url: https://github.com/ros/genmsg + version: kinetic-devel + gennodejs: + type: git + url: https://github.com/RethinkRobotics-opensource/gennodejs + version: kinetic-devel + genpy: + type: git + url: https://github.com/ros/genpy + version: main + geometry: + type: git + url: git@github.com:ros-o/geometry.git + version: obese-devel + common_msgs: + type: git + url: git@github.com:ros/common_msgs.git + version: noetic-devel + kdl_parser: + type: git + url: git@github.com:ros/kdl_parser.git + version: noetic-devel + message_generation: + type: git + url: https://github.com/ros/message_generation + version: kinetic-devel + message_runtime: + type: git + url: https://github.com/ros/message_runtime + version: kinetic-devel + pluginlib: + type: git + url: https://github.com/ros-o/pluginlib + version: obese-devel + resource_retriever: + type: git + url: git@github.com:ros/resource_retriever.git + version: kinetic-devel + ros: + type: git + url: https://github.com/ros/ros + version: noetic-devel + ros_comm: + type: git + url: https://github.com/ros-o/ros_comm + version: obese-devel + ros_comm_msgs: + type: git + url: https://github.com/ros/ros_comm_msgs + version: kinetic-devel + rosconsole: + type: git + url: https://github.com/ros-o/rosconsole + version: obese-devel + rosconsole_bridge: + type: git + url: git@github.com:ros/rosconsole_bridge.git + version: kinetic-devel + roscpp_core: + type: git + url: https://github.com/ros-o/roscpp_core + version: obese-devel + rospack: + type: git + url: https://github.com/ros/rospack + version: noetic-devel + std_msgs: + type: git + url: https://github.com/ros/std_msgs + version: kinetic-devel + urdf: + type: git + url: git@github.com:ros/urdf.git + version: melodic-devel From c94bee1a13807420d59cfe294bc4e448cf5d178a Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 14 Jul 2024 20:16:47 -0700 Subject: [PATCH 25/76] need geometry2 in underlay workspace --- dependencies.sh | 3 ++- underlay_repos.yaml | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dependencies.sh b/dependencies.sh index aae9ef6..fbd9e45 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -43,4 +43,5 @@ apt-get install -y python3-gnupg # apt-get install -y python3-rosunit apt-get install -y catkin-tools -apt-get install -y vcstool +apt-get install -y libbullet-dev +apt-get install -y vcstool || true # this is in 24.04 but not 20.04 diff --git a/underlay_repos.yaml b/underlay_repos.yaml index 6084939..52eb35c 100644 --- a/underlay_repos.yaml +++ b/underlay_repos.yaml @@ -23,6 +23,10 @@ repositories: type: git url: https://github.com/ros/cmake_modules version: 0.5-devel + common_msgs: + type: git + url: git@github.com:ros/common_msgs.git + version: noetic-devel console_bridge: type: git url: https://github.com/ros/console_bridge @@ -55,9 +59,9 @@ repositories: type: git url: git@github.com:ros-o/geometry.git version: obese-devel - common_msgs: + geometry2: type: git - url: git@github.com:ros/common_msgs.git + url: git@github.com:lucasw/geometry2 version: noetic-devel kdl_parser: type: git From ae049aaed897cc1c7d21eefd21aa4dac7fbfacd2 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 14 Jul 2024 20:27:02 -0700 Subject: [PATCH 26/76] don't use any of my custom versions in underlay_ws --- underlay_repos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/underlay_repos.yaml b/underlay_repos.yaml index 52eb35c..4de723d 100644 --- a/underlay_repos.yaml +++ b/underlay_repos.yaml @@ -59,7 +59,7 @@ repositories: type: git url: git@github.com:ros-o/geometry.git version: obese-devel - geometry2: + geometry2: # TODO(lucasw) use ros-o type: git url: git@github.com:lucasw/geometry2 version: noetic-devel From 930c1fd462df5fec6fec52acbee3d454520a31bc Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 14 Jul 2024 20:27:19 -0700 Subject: [PATCH 27/76] remove repos already in underlay_ws --- ubuntu_2404/base_repos.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index 9818472..659cbac 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -23,10 +23,10 @@ repositories: type: git url: git@github.com:warthog-cpr/warthog_simulator.git version: melodic-devel - extra/common_msgs: - type: git - url: git@github.com:ros/common_msgs.git - version: noetic-devel + # extra/common_msgs: # in underlay_ws + # type: git + # url: git@github.com:ros/common_msgs.git + # version: noetic-devel # extra/geometry: # type: git # url: git@github.com:ros-o/geometry.git @@ -236,10 +236,10 @@ repositories: type: git url: git@github.com:lucasw/fuse version: cpp17 - other/geneus: - type: git - url: git@github.com:jsk-ros-pkg/geneus.git - version: master + # other/geneus: # in underlay_ws + # type: git + # url: git@github.com:jsk-ros-pkg/geneus.git + # version: master other/graph_rviz_plugin: type: git url: git@github.com:lucasw/graph_rviz_plugin @@ -464,10 +464,10 @@ repositories: type: git url: git@github.com:ros-geographic-info/geographic_info.git version: master - ros/geometry2: - type: git - url: git@github.com:lucasw/geometry2 - version: noetic_aggregated + # ros/geometry2: # in underlay_ws + # type: git + # url: git@github.com:lucasw/geometry2 + # version: noetic_aggregated ros/grid_map: type: git url: git@github.com:lucasw/grid_map @@ -532,7 +532,7 @@ repositories: type: git url: git@github.com:lucasw/robot_state_publisher version: robot_state_function - ros/ros_comm: + ros/ros_comm: # custom overlay with logging mods type: git url: git@github.com:lucasw/ros_comm version: salsa_noetic_aggregated @@ -548,11 +548,11 @@ repositories: type: git url: git@github.com:lucasw/ros_tutorials.git version: boost_placeholders - ros/rosconsole: + ros/rosconsole: # lucasw logging mods type: git url: git@github.com:lucasw/rosconsole version: ubuntu_2210 - ros/roscpp_core: + ros/roscpp_core: # lucasw fixes type: git url: git@github.com:lucasw/roscpp_core version: duration_out_of_dual_range @@ -560,7 +560,7 @@ repositories: type: git url: git@github.com:lucasw/roslint version: roslint_rust - ros/rospack: + ros/rospack: # debian patches type: git url: git@github.com:lucasw/rospack version: salsa From d5fadc4c3e95a327d8064327069799efa7e62ffe Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 14 Jul 2024 23:20:08 -0700 Subject: [PATCH 28/76] apt install dependencies and update vdb_mapping branch to one that builds on 24.04 --- ubuntu_2404/README.md | 16 +++++++++++++++- ubuntu_2404/base_repos.yaml | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ubuntu_2404/README.md b/ubuntu_2404/README.md index 184d689..4daf7b2 100644 --- a/ubuntu_2404/README.md +++ b/ubuntu_2404/README.md @@ -1,5 +1,19 @@ +Additional dependencies - +``` +apt-get install +libb64-dev +libboost-iostreams-dev +libboost-test-dev +libboost-timer-dev +libcgal-dev +libgdal-dev +libopencv-dev +liboctomap-dev +libpcl-dev +libvtk9-dev +sip-dev +``` Some packages (like jsk_recognition_msgs) expect ROS_DISTRO to exist, so: diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index 659cbac..07331e8 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -403,7 +403,7 @@ repositories: other/vdb/vdb_mapping: type: git url: git@github.com:lucasw/vdb_mapping - version: min_range + version: ubuntu_2404 other/vdb/vdb_mapping_ros: type: git url: git@github.com:lucasw/vdb_mapping_ros From 67ab5839b9845dd616e1ef3d12971b731a1ac192 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Mon, 15 Jul 2024 08:08:10 -0700 Subject: [PATCH 29/76] move all git clones into vcs yaml file, commingle catkin packages and cmake/python packages for now --- .github/workflows/ubuntu_24_04.yaml | 4 +-- Dockerfile | 12 ++++--- build.sh | 27 +++++++++------ git_clone.sh | 18 ++-------- underlay_repos.yaml | 52 +++++++++++++++++++++-------- 5 files changed, 66 insertions(+), 47 deletions(-) diff --git a/.github/workflows/ubuntu_24_04.yaml b/.github/workflows/ubuntu_24_04.yaml index 438db5a..312a256 100644 --- a/.github/workflows/ubuntu_24_04.yaml +++ b/.github/workflows/ubuntu_24_04.yaml @@ -6,7 +6,7 @@ on: jobs: ubuntu2404dockeron2204: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 # env: steps: - name: git clone git@github.com:lucasw/ros_from_src @@ -18,7 +18,7 @@ jobs: - name: docker build from source 24.04 run: | cd ros_from_src - docker build --build-arg IMAGE=ubuntu:24.04 --build-arg PYTHON_MINOR_VERSION=10 . -t ros2404 + docker build --build-arg IMAGE=ubuntu:24.04 . -t ros2404 # TODO(lucasw) ubuntu_2404/Dockerfile doesn't work, was depending on the now-removed # apt debian science ros packages diff --git a/Dockerfile b/Dockerfile index 5110dbf..f96bba7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG IMAGE=ubuntu:22.04 +ARG IMAGE=ubuntu:24.04 FROM ${IMAGE} ARG IMAGE RUN echo ${IMAGE} @@ -14,9 +14,9 @@ RUN apt-get install -yqq git # TODO(lucasw) this doesn't work in 20.04 because of log # --build-args ROSCONSOLE=https://github.com/ros-o/rosconsole -ARG ROSCONSOLE=https://github.com/ros-o/rosconsole +# ARG ROSCONSOLE=https://github.com/ros-o/rosconsole # ENV ROSCONSOLE=$ROSCONSOLE -RUN echo $ROSCONSOLE +# RUN echo $ROSCONSOLE # packages that need to be cmake installed, and are ros packages in a catkin workspace RUN mkdir $SRC/ros_from_src -p @@ -26,9 +26,11 @@ COPY dependencies.sh $SRC/ros_from_src RUN $SRC/ros_from_src/dependencies.sh # WORKDIR $SRC/ros_from_src -COPY underlay_repos.yaml $SRC/ros_from_src +RUN mkdir -p underlay_ws/src +COPY underlay_repos.yaml underlay_ws/src COPY git_clone.sh $SRC/ros_from_src -RUN ROS_CONSOLE=$ROSCONSOLE $SRC/ros_from_src/git_clone.sh +# RUN ROS_CONSOLE=$ROSCONSOLE $SRC/ros_from_src/git_clone.sh +RUN $SRC/ros_from_src/git_clone.sh COPY build.sh $SRC/ros_from_src RUN $SRC/ros_from_src/build.sh diff --git a/build.sh b/build.sh index 820811e..1660961 100755 --- a/build.sh +++ b/build.sh @@ -14,6 +14,10 @@ mkdir -p $BUILD DEST=`pwd`/ros +WS=`pwd`/underlay_ws/src +echo $WS +mkdir $WS -p + # python installs python --version | awk '{print $2}' | cut -d'.' -f1 @@ -32,7 +36,7 @@ export PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH0:$OPT_PYTHONPATH1 echo PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH0:$OPT_PYTHONPATH1 # catkin_pkg -cd $SRC/catkin_pkg +cd $WS/catkin_pkg python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed ls -l $OPT_PYTHONPATH0 || ls -l $OPT_PYTHONPATH1 ls -l $OPT_PYTHONPATH0/catkin_pkg* || ls -l $OPT_PYTHONPATH1/catkin_pkg* @@ -42,22 +46,25 @@ python -c "from catkin_pkg.package import parse_package" # osrf pycommon -cd $SRC/osrf_pycommon +cd $WS/osrf_pycommon # TODO(lucasw) install to $DEST python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed # catkin tools -cd $SRC/catkin_tools +cd $WS/catkin_tools python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed # catkin install mkdir -p $BUILD/catkin cd $BUILD/catkin cmake $WS/catkin -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF -DCATKIN_INSTALL_INTO_PREFIX_ROOT=true && make && make install -python -c "import catkin; print(catkin)" -ls -l $DEST/bin +ls -l $DEST/local/bin PATH=$PATH:$DEST/bin PATH=$PATH:$DEST/local/bin +which catkin +catkin --version +echo $PYTHONPATH +python -c "import catkin; print(catkin)" # console_bridge mkdir -p $BUILD/console_bridge @@ -90,7 +97,7 @@ make install mkdir -p $BUILD/ros_environment pwd cd $BUILD/ros_environment -cmake $SRC/ros_environment -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF +cmake $WS/ros_environment -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF make make install @@ -130,13 +137,13 @@ make make install # rospkg -cd $SRC/rospkg +cd $WS/rospkg python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed -cd $SRC/rosdistro +cd $WS/rosdistro python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed -cd $SRC/rosdep +cd $WS/rosdep python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed rosdep init || true rosdep update @@ -144,5 +151,3 @@ rosdep update # TODO(lucasw) already have a copy of this but needs to be in the workspace # find / | grep setup.bash # find / | grep catkin-config.cmake - - diff --git a/git_clone.sh b/git_clone.sh index 97b7308..7c3468b 100755 --- a/git_clone.sh +++ b/git_clone.sh @@ -1,6 +1,8 @@ #!/bin/bash # TODO(lucasw) replace the below with submodules # export PATH=$PATH:/usr/local/bin +set -e + SRC=`pwd`/src echo $SRC mkdir $SRC -p @@ -12,21 +14,7 @@ mkdir $WS -p # TODO(lucasw) replace these git clones with vcs # packages that need to be cmake installed, and are ros packages in a catkin workspace cd $WS -vcs import --input underlay_repos.yaml +vcs import --input underlay_repos.yaml --retry 5 # ROSCONSOLE1=${ROSCONSOLE:-https://github.com/ros-o/rosconsole} # git clone $ROSCONSOLE1 - -# pure python -cd $SRC -git clone https://github.com/ros-infrastructure/catkin_pkg -git clone https://github.com/osrf/osrf_pycommon -git clone https://github.com/catkin/catkin_tools - -# cmake installs -git clone https://github.com/ros-o/ros_environment - -# runtime -git clone https://github.com/ros-infrastructure/rospkg -git clone https://github.com/ros-infrastructure/rosdistro -git clone https://github.com/lucasw/rosdep --branch disable_root_etc_ros diff --git a/underlay_repos.yaml b/underlay_repos.yaml index 4de723d..6748a37 100644 --- a/underlay_repos.yaml +++ b/underlay_repos.yaml @@ -1,20 +1,28 @@ repositories: + # TODO(lucasw) separate the ros catkin packages from cmake/python packages actionlib: type: git - url: git@github.com:ros/actionlib.git + url: https://github.com/ros/actionlib.git version: noetic-devel angles: type: git - url: git@github.com:ros/angles.git + url: https://github.com/ros/angles.git version: master bond_core: type: git - url: git@github.com:ros-o/bond_core.git + url: https://github.com/ros-o/bond_core.git version: obese-devel catkin: type: git - url: https://github.com/ros/catkin - version: noetic-devel + url: https://github.com/ros-o/catkin + version: obese-devel + catkin_pkg: + type: git + url: https://github.com/ros-infrastructure/catkin_pkg + # version: noetic-devel + catkin_tools: + type: git + url: https://github.com/catkin/catkin_tools class_loader: type: git url: https://github.com/ros-o/class_loader @@ -25,7 +33,7 @@ repositories: version: 0.5-devel common_msgs: type: git - url: git@github.com:ros/common_msgs.git + url: https://github.com/ros/common_msgs.git version: noetic-devel console_bridge: type: git @@ -57,15 +65,15 @@ repositories: version: main geometry: type: git - url: git@github.com:ros-o/geometry.git + url: https://github.com/ros-o/geometry.git version: obese-devel - geometry2: # TODO(lucasw) use ros-o + geometry2: type: git - url: git@github.com:lucasw/geometry2 - version: noetic-devel + url: https://github.com/ros-o/geometry2 + version: obese-devel kdl_parser: type: git - url: git@github.com:ros/kdl_parser.git + url: https://github.com/ros/kdl_parser.git version: noetic-devel message_generation: type: git @@ -75,13 +83,16 @@ repositories: type: git url: https://github.com/ros/message_runtime version: kinetic-devel + osrf_pycommon: + type: git + url: https://github.com/osrf/osrf_pycommon pluginlib: type: git url: https://github.com/ros-o/pluginlib version: obese-devel resource_retriever: type: git - url: git@github.com:ros/resource_retriever.git + url: https://github.com/ros/resource_retriever.git version: kinetic-devel ros: type: git @@ -95,27 +106,40 @@ repositories: type: git url: https://github.com/ros/ros_comm_msgs version: kinetic-devel + ros_environment: + type: git + url: https://github.com/ros-o/ros_environment rosconsole: type: git url: https://github.com/ros-o/rosconsole version: obese-devel rosconsole_bridge: type: git - url: git@github.com:ros/rosconsole_bridge.git + url: https://github.com/ros/rosconsole_bridge version: kinetic-devel roscpp_core: type: git url: https://github.com/ros-o/roscpp_core version: obese-devel + rosdep: + type: git + url: https://github.com/lucasw/rosdep + version: disable_root_etc_ros + rosdistro: + type: git + url: https://github.com/ros-infrastructure/rosdistro rospack: type: git url: https://github.com/ros/rospack version: noetic-devel + rospkg: + type: git + url: https://github.com/ros-infrastructure/rospkg std_msgs: type: git url: https://github.com/ros/std_msgs version: kinetic-devel urdf: type: git - url: git@github.com:ros/urdf.git + url: https://github.com/ros/urdf.git version: melodic-devel From 70bc0a831b606abc8c3baedb4d3a068aa9eabf35 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Mon, 15 Jul 2024 12:44:21 -0700 Subject: [PATCH 30/76] now the 24.04 docker build is working --- Dockerfile | 2 +- build.sh | 12 +++++++++--- catkin.sh | 8 +++++++- env.sh | 7 ++++--- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index f96bba7..24b065f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,10 +32,10 @@ COPY git_clone.sh $SRC/ros_from_src # RUN ROS_CONSOLE=$ROSCONSOLE $SRC/ros_from_src/git_clone.sh RUN $SRC/ros_from_src/git_clone.sh +COPY env.sh underlay_ws COPY build.sh $SRC/ros_from_src RUN $SRC/ros_from_src/build.sh -COPY env.sh $SRC/ros_from_src COPY catkin.sh $SRC/ros_from_src RUN $SRC/ros_from_src/catkin.sh diff --git a/build.sh b/build.sh index 1660961..b946ebe 100755 --- a/build.sh +++ b/build.sh @@ -32,8 +32,10 @@ echo $PYTHONPATH0 OPT_PYTHONPATH1=$DEST/local/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/dist-packages/ mkdir -p $OPT_PYTHONPATH1 echo $PYTHONPATH1 -export PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH0:$OPT_PYTHONPATH1 -echo PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH0:$OPT_PYTHONPATH1 + +ROS_DEST=$DEST source $WS/../env.sh + +# export PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH0:$OPT_PYTHONPATH1 # catkin_pkg cd $WS/catkin_pkg @@ -44,7 +46,6 @@ ls -l $OPT_PYTHONPATH0/catkin_pkg* || ls -l $OPT_PYTHONPATH1/catkin_pkg* python -c "import catkin_pkg; print(catkin_pkg.__version__)" python -c "from catkin_pkg.package import parse_package" - # osrf pycommon cd $WS/osrf_pycommon # TODO(lucasw) install to $DEST @@ -107,6 +108,8 @@ cd $BUILD/rospack cmake $WS/rospack -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF -Dcmake_modules_DIR=$DEST/share/cmake_modules/cmake/ make make install +ls -l $DEST/lib +rospack help # genmsg mkdir -p $BUILD/genmsg @@ -148,6 +151,9 @@ python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-v rosdep init || true rosdep update +touch $WS/rosdep/test/CATKIN_IGNORE +touch $WS/catkin_pkg/test/CATKIN_IGNORE + # TODO(lucasw) already have a copy of this but needs to be in the workspace # find / | grep setup.bash # find / | grep catkin-config.cmake diff --git a/catkin.sh b/catkin.sh index 0075abb..44468d4 100755 --- a/catkin.sh +++ b/catkin.sh @@ -1,6 +1,10 @@ #!/bin/bash +set -e +set -x -source env.sh +ls -l +ls -l ros/bin +ROS_DEST=`pwd`/ros source underlay_ws/env.sh WS=`pwd`/underlay_ws/src echo $WS @@ -10,6 +14,8 @@ echo "#####################" pwd catkin init catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -DCATKIN_ENABLE_TESTING=False +echo $PATH +echo $LD_LIBRARY_PATH rospack list catkin build diff --git a/env.sh b/env.sh index 18aa48a..88fe78e 100755 --- a/env.sh +++ b/env.sh @@ -1,7 +1,8 @@ #!/usr/bin/bash -# source ros_from_src/env.sh -export ROS_DEST=`pwd`/ros -# export PATH=$PATH:$ROS_DEST/bin +# ROS_DEST=`pwd`/ros source ros_from_src/env.sh +# export ROS_DEST=`pwd`/ros +export PATH=$PATH:$ROS_DEST/bin +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROS_DEST/lib # export PATH=$PATH:$ROS_DEST/local/bin # python --version | awk '{print $2}' | cut -d'.' -f1 From e6304429570f191018d1ad005adeccab827cecfc Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 16 Jul 2024 14:11:41 -0700 Subject: [PATCH 31/76] need to ignore catkin test packages (though they shouldn't really be in the real workspace) --- build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.sh b/build.sh index b946ebe..e392b48 100755 --- a/build.sh +++ b/build.sh @@ -151,8 +151,13 @@ python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-v rosdep init || true rosdep update +# TODO(lucasw) wouldn't need to ignore most of these if the non-catkin packages +# that have catkin test packages in them were cloned separately touch $WS/rosdep/test/CATKIN_IGNORE touch $WS/catkin_pkg/test/CATKIN_IGNORE +touch $WS/catkin_tools/docs/examples/CATKIN_IGNORE +touch $WS/catkin_tools/tests/CATKIN_IGNORE +touch $WS/rospkg/test/CATKIN_IGNORE # TODO(lucasw) already have a copy of this but needs to be in the workspace # find / | grep setup.bash From 45e84bad9b117ac1351de3b09b19fc3ca471b82f Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 16 Jul 2024 14:13:03 -0700 Subject: [PATCH 32/76] need to ignore people tracking filter because don't have liborocos-bfl (and don't currently want to build it manually) --- ubuntu_2404/ignore.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ubuntu_2404/ignore.sh b/ubuntu_2404/ignore.sh index 67222f0..5959d4c 100755 --- a/ubuntu_2404/ignore.sh +++ b/ubuntu_2404/ignore.sh @@ -36,6 +36,7 @@ touch ./other/mavros/test_mavros/CATKIN_IGNORE touch ./other/openni2_camera/CATKIN_IGNORE touch ./other/people/face_detector/CATKIN_IGNORE touch ./other/people/leg_detector/CATKIN_IGNORE +touch ./other/people/people_tracking_filter/CATKIN_IGNORE touch ./other/ros_rtsp/CATKIN_IGNORE touch ./other/pal_statistics/pal_statistics/CATKIN_IGNORE touch ./ros/gazebo_ros_demos/CATKIN_IGNORE From ec347f69b49da6db723bd4fb99dbb1ba440ba764 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 16 Jul 2024 14:13:24 -0700 Subject: [PATCH 33/76] base_ws apt installs for 24.04 --- ubuntu_2404/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ubuntu_2404/README.md b/ubuntu_2404/README.md index 4daf7b2..326abd1 100644 --- a/ubuntu_2404/README.md +++ b/ubuntu_2404/README.md @@ -15,6 +15,12 @@ libvtk9-dev sip-dev ``` +``` +apt-get install +libassimp-dev +libogre-1.12-dev +``` + Some packages (like jsk_recognition_msgs) expect ROS_DISTRO to exist, so: ``` From 2bb74869febadcf110f5d34319bba0e032dfd10f Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 16 Jul 2024 14:13:54 -0700 Subject: [PATCH 34/76] move some repos from base to underlay for 24.04 --- ubuntu_2404/base_repos.yaml | 8 ++++---- underlay_repos.yaml | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index 07331e8..5c8469e 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -484,6 +484,10 @@ repositories: type: git url: git@github.com:lucasw/image_transport_plugins version: enable_pub + ros/interactive_markers: + type: git + url: git@github.com:ros-visualization/interactive_markers.git + version: noetic-devel ros/joint_state_publisher: type: git url: git@github.com:lucasw/joint_state_publisher @@ -556,10 +560,6 @@ repositories: type: git url: git@github.com:lucasw/roscpp_core version: duration_out_of_dual_range - ros/roslint: - type: git - url: git@github.com:lucasw/roslint - version: roslint_rust ros/rospack: # debian patches type: git url: git@github.com:lucasw/rospack diff --git a/underlay_repos.yaml b/underlay_repos.yaml index 6748a37..07d2b47 100644 --- a/underlay_repos.yaml +++ b/underlay_repos.yaml @@ -128,6 +128,10 @@ repositories: rosdistro: type: git url: https://github.com/ros-infrastructure/rosdistro + roslint: + type: git + url: git@github.com:lucasw/roslint + version: roslint_rust rospack: type: git url: https://github.com/ros/rospack From 8df96cc13f176dffd8b1e1ba5bd0073555e70ae3 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 16 Jul 2024 20:31:18 -0700 Subject: [PATCH 35/76] use version of resource_retriever that links to libcurl properly --- underlay_repos.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/underlay_repos.yaml b/underlay_repos.yaml index 07d2b47..db812ee 100644 --- a/underlay_repos.yaml +++ b/underlay_repos.yaml @@ -92,8 +92,8 @@ repositories: version: obese-devel resource_retriever: type: git - url: https://github.com/ros/resource_retriever.git - version: kinetic-devel + url: https://github.com/lucasw/resource_retriever.git + version: curl_lib ros: type: git url: https://github.com/ros/ros From 0611120b25e223736a4ded6c6ec424b5b3d54789 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 16 Jul 2024 21:11:08 -0700 Subject: [PATCH 36/76] need to use http:// instead of git@ in underlay repos yaml --- underlay_repos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/underlay_repos.yaml b/underlay_repos.yaml index db812ee..431c629 100644 --- a/underlay_repos.yaml +++ b/underlay_repos.yaml @@ -130,7 +130,7 @@ repositories: url: https://github.com/ros-infrastructure/rosdistro roslint: type: git - url: git@github.com:lucasw/roslint + url: https://github.com/lucasw/roslint version: roslint_rust rospack: type: git From b272fff6a0454aa0b0615672e111090ef732b038 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 16 Jul 2024 21:11:22 -0700 Subject: [PATCH 37/76] ignore geneus --- ubuntu_2404/ignore.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ubuntu_2404/ignore.sh b/ubuntu_2404/ignore.sh index 5959d4c..da8b5e4 100755 --- a/ubuntu_2404/ignore.sh +++ b/ubuntu_2404/ignore.sh @@ -25,7 +25,6 @@ touch ./other/jsk_recognition/sound_classification/CATKIN_IGNORE touch ./other/jsk_roseus/CATKIN_IGNORE touch ./other/jsk_roseus/roseus_msgs/CATKIN_IGNORE touch ./other/euslisp-release/CATKIN_IGNORE -touch ./other/geneus/CATKIN_IGNORE # touch ./other/mesh_tools/mesh_msgs_hdf5/CATKIN_IGNORE # touch ./other/mesh_tools/hdf5_map_io/CATKIN_IGNORE # touch ./other/mesh_tools/rviz_map_plugin/CATKIN_IGNORE From a13df9856a1a10b2da75ddff87140a56335971f6 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 17 Jul 2024 06:32:26 -0700 Subject: [PATCH 38/76] more dependencies for 24.04 build --- dependencies.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dependencies.sh b/dependencies.sh index fbd9e45..0d23e8b 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -12,14 +12,17 @@ apt-get install -y libboost-filesystem-dev apt-get install -y libboost-program-options-dev apt-get install -y libboost-regex-dev apt-get install -y libboost-thread-dev +apt-get install -y libcurl4-openssl-dev apt-get install -y libfmt-dev apt-get install -y libgpgme-dev apt-get install -y libgtest-dev apt-get install -y liblog4cxx-dev apt-get install -y liblz4-dev lz4 +apt-get install -y liborocos-kdl-dev apt-get install -y libpoco-dev apt-get install -y libtinyxml-dev apt-get install -y libtinyxml2-dev +apt-get install -y liburdfdom-headers-dev apt-get install -y mawk apt-get install -y python-is-python3 apt-get install -y python3 From bf227af5158f8e7f1f487ef00397c98d94dece3b Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 17 Jul 2024 06:52:28 -0700 Subject: [PATCH 39/76] need urdfdom --- dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dependencies.sh b/dependencies.sh index 0d23e8b..522ef93 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -22,6 +22,7 @@ apt-get install -y liborocos-kdl-dev apt-get install -y libpoco-dev apt-get install -y libtinyxml-dev apt-get install -y libtinyxml2-dev +apt-get install -y liburdfdom-dev apt-get install -y liburdfdom-headers-dev apt-get install -y mawk apt-get install -y python-is-python3 From f9150ec07f2a364bd3ba5c9fea330f38510fbbfa Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 17 Jul 2024 06:52:49 -0700 Subject: [PATCH 40/76] have vcs retry more times --- git_clone.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_clone.sh b/git_clone.sh index 7c3468b..9324552 100755 --- a/git_clone.sh +++ b/git_clone.sh @@ -14,7 +14,7 @@ mkdir $WS -p # TODO(lucasw) replace these git clones with vcs # packages that need to be cmake installed, and are ros packages in a catkin workspace cd $WS -vcs import --input underlay_repos.yaml --retry 5 +vcs import --input underlay_repos.yaml --retry 10 # ROSCONSOLE1=${ROSCONSOLE:-https://github.com/ros-o/rosconsole} # git clone $ROSCONSOLE1 From f970b0b185214236b0b56388e9f73a4cf4deb8c9 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 17 Jul 2024 06:54:03 -0700 Subject: [PATCH 41/76] match git url format of the rest of repos --- underlay_repos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/underlay_repos.yaml b/underlay_repos.yaml index 431c629..c54586b 100644 --- a/underlay_repos.yaml +++ b/underlay_repos.yaml @@ -92,7 +92,7 @@ repositories: version: obese-devel resource_retriever: type: git - url: https://github.com/lucasw/resource_retriever.git + url: https://github.com/lucasw/resource_retriever version: curl_lib ros: type: git From 9e5a4ef0ae8cadfa649bc5a36aa8ea4f82a6a7bf Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 17 Jul 2024 06:54:20 -0700 Subject: [PATCH 42/76] more apt installs for 24.04 needed for runtime --- ubuntu_2404/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ubuntu_2404/README.md b/ubuntu_2404/README.md index 326abd1..dfa17df 100644 --- a/ubuntu_2404/README.md +++ b/ubuntu_2404/README.md @@ -21,6 +21,15 @@ libassimp-dev libogre-1.12-dev ``` +``` +python3-opencv +python3-pykdl +``` + +``` +pip install cmake +``` + Some packages (like jsk_recognition_msgs) expect ROS_DISTRO to exist, so: ``` From d95d97e8dc233c70b84b65602d19bbcf830daeef Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 17 Jul 2024 06:55:08 -0700 Subject: [PATCH 43/76] highlight console bridge build --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index e392b48..e92a914 100755 --- a/build.sh +++ b/build.sh @@ -74,6 +74,7 @@ cd $BUILD/console_bridge cmake $WS/console_bridge -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DEST -DCMAKE_INSTALL_LIBDIR=lib make make install +echo "console bridge" # cmake_modules cd $WS From 8573867c630246ac4aa3c1f95b1d25d40c0db67e Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 17 Jul 2024 07:36:10 -0700 Subject: [PATCH 44/76] also install python3-rospkg --- dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dependencies.sh b/dependencies.sh index 522ef93..1e41556 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -32,6 +32,7 @@ apt-get install -y python3-dev apt-get install -y python3-docutils apt-get install -y python3-empy apt-get install -y python3-pyparsing +apt-get install -y python3-rospkg apt-get install -y python3-setuptools apt-get install -y python3-yaml From 44509d5e3be6efac8cf0cdb4b51b37f5f693eca0 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 17 Jul 2024 09:38:47 -0700 Subject: [PATCH 45/76] making the base_repos.yaml smaller and running a limited catkin build on them, also will later build visualization and other repos --- Dockerfile | 13 + catkin.sh | 2 +- ubuntu_2404/base_catkin.sh | 25 ++ ubuntu_2404/base_git_clone.sh | 17 + ubuntu_2404/base_repos.yaml | 470 +++++----------------- ubuntu_2404/dependencies.sh | 3 + ubuntu_2404/extra_repos.yaml | 678 ++++++++++++++++++++++++++++++++ ubuntu_2404/rqt_rviz_repos.yaml | 506 ++++++++++++++++++++++++ 8 files changed, 1348 insertions(+), 366 deletions(-) create mode 100755 ubuntu_2404/base_catkin.sh create mode 100755 ubuntu_2404/base_git_clone.sh create mode 100755 ubuntu_2404/dependencies.sh create mode 100644 ubuntu_2404/extra_repos.yaml create mode 100644 ubuntu_2404/rqt_rviz_repos.yaml diff --git a/Dockerfile b/Dockerfile index 24b065f..90fdee7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,5 +39,18 @@ RUN $SRC/ros_from_src/build.sh COPY catkin.sh $SRC/ros_from_src RUN $SRC/ros_from_src/catkin.sh +# WORKDIR $SRC/ros_from_src +RUN mkdir -p base_ws/src +COPY ubuntu_2404/base_repos.yaml base_ws/src +COPY ubuntu_2404/base_git_clone.sh $SRC/ros_from_src +# RUN ROS_CONSOLE=$ROSCONSOLE $SRC/ros_from_src/git_clone.sh +RUN $SRC/ros_from_src/base_git_clone.sh + +COPY ubuntu_2404/dependencies.sh $SRC/ros_from_src/base_dependencies.sh +RUN $SRC/ros_from_src/base_dependencies.sh + +COPY ubuntu_2404/base_catkin.sh $SRC/ros_from_src +RUN $SRC/ros_from_src/base_catkin.sh + WORKDIR $WS/.. # TODO(lucasw) run tests diff --git a/catkin.sh b/catkin.sh index 44468d4..bbba7af 100755 --- a/catkin.sh +++ b/catkin.sh @@ -19,6 +19,6 @@ echo $LD_LIBRARY_PATH rospack list catkin build -source devel/setup.bash +source install/setup.bash rospack list # TODO(lucasw) run tests diff --git a/ubuntu_2404/base_catkin.sh b/ubuntu_2404/base_catkin.sh new file mode 100755 index 0000000..4d3256a --- /dev/null +++ b/ubuntu_2404/base_catkin.sh @@ -0,0 +1,25 @@ +#!/bin/bash +set -e +set -x + +ls -l +ls -l ros/bin +ROS_DEST=`pwd`/ros source underlay_ws/env.sh + +WS=`pwd`/base_ws/src +echo $WS + +cd $WS/.. +echo "#####################" +pwd +source ../underlay_ws/install/setup.bash +catkin init +catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -DCATKIN_ENABLE_TESTING=False +echo $PATH +echo $LD_LIBRARY_PATH +rospack list + +catkin build ros_comm +source install/setup.bash +rospack list +# TODO(lucasw) run tests diff --git a/ubuntu_2404/base_git_clone.sh b/ubuntu_2404/base_git_clone.sh new file mode 100755 index 0000000..4daac20 --- /dev/null +++ b/ubuntu_2404/base_git_clone.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# TODO(lucasw) replace the below with submodules +# export PATH=$PATH:/usr/local/bin +set -e +set -x + +WS=`pwd`/base_ws/src +echo $WS +mkdir $WS -p + +# TODO(lucasw) replace these git clones with vcs +# packages that need to be cmake installed, and are ros packages in a catkin workspace +cd $WS +vcs import --input base_repos.yaml --retry 10 + +# ROSCONSOLE1=${ROSCONSOLE:-https://github.com/ros-o/rosconsole} +# git clone $ROSCONSOLE1 diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index 5c8469e..a3a3c9a 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -1,678 +1,418 @@ repositories: - clearpath/cpr_gazebo: - type: git - url: https://github.com/clearpathrobotics/cpr_gazebo.git - version: noetic-devel - clearpath/husky: - type: git - url: git@github.com:lucasw/husky - version: roslint_fixes - clearpath/moose: - type: git - url: git@github.com:lucasw/moose - version: pluginlib_hpp - clearpath/moose_simulator: - type: git - url: git@github.com:moose-cpr/moose_simulator.git - version: master - clearpath/warthog: - type: git - url: git@github.com:warthog-cpr/warthog - version: kinetic-devel - clearpath/warthog_simulator: - type: git - url: git@github.com:warthog-cpr/warthog_simulator.git - version: melodic-devel # extra/common_msgs: # in underlay_ws # type: git - # url: git@github.com:ros/common_msgs.git + # url: https://github.com/ros/common_msgs # version: noetic-devel # extra/geometry: # type: git - # url: git@github.com:ros-o/geometry.git + # url: https://github.com/ros-o/geometry # version: obese-devel extra/laser_geometry: type: git - url: git@github.com:ros-o/laser_geometry.git + url: https://github.com/ros-o/laser_geometry version: obese-devel extra/navigation_msgs: type: git - url: git@github.com:ros-planning/navigation_msgs.git + url: https://github.com/ros-planning/navigation_msgs version: ros1 extra/pcl_msgs: type: git - url: git@github.com:ros-perception/pcl_msgs.git + url: https://github.com/ros-perception/pcl_msgs version: noetic-devel extra/perception_pcl: type: git - url: git@github.com:ros-o/perception_pcl.git + url: https://github.com/ros-o/perception_pcl version: obese-devel extra/python_qt_binding: type: git - url: git@github.com:ros-o/python_qt_binding.git + url: https://github.com/ros-o/python_qt_binding version: obese-devel extra/vision_opencv: type: git - url: git@github.com:ros-perception/vision_opencv.git + url: https://github.com/ros-perception/vision_opencv version: noetic - greenzie/boustrophedon_planner: - type: git - url: git@github.com:lucasw/boustrophedon_planner - version: cpp17 - lucasw/carbot: - type: git - url: git@github.com:lucasw/carbot - version: master lucasw/dynamic_reconfigure_tools: type: git - url: git@github.com:lucasw/dynamic_reconfigure_tools - version: master - lucasw/frei0r_image: - type: git - url: git@github.com:lucasw/frei0r_image + url: https://github.com/lucasw/dynamic_reconfigure_tools version: master lucasw/image_manip: type: git - url: git@github.com:lucasw/image_manip + url: https://github.com/lucasw/image_manip version: fix_zero_frame_rate - lucasw/joy_feedback_ros: - type: git - url: git@github.com:lucasw/joy_feedback_ros - version: master lucasw/nodelet_demo: type: git - url: git@github.com:lucasw/nodelet_demo - version: master - lucasw/popcanbot: - type: git - url: git@github.com:lucasw/popcanbot + url: https://github.com/lucasw/nodelet_demo version: master lucasw/ros1_lifecycle: type: git - url: git@github.com:lucasw/ros1_lifecycle + url: https://github.com/lucasw/ros1_lifecycle version: misc_fixes lucasw/ros_example: type: git - url: git@github.com:lucasw/ros_example + url: https://github.com/lucasw/ros_example version: main lucasw/ros_system_monitor: type: git - url: git@github.com:lucasw/ros_system_monitor + url: https://github.com/lucasw/ros_system_monitor version: chrony_monitor - lucasw/rqt_file_dialog: - type: git - url: git@github.com:lucasw/rqt_file_dialog - version: master - lucasw/rqt_tf_echo: - type: git - url: git@github.com:lucasw/rqt_tf_echo.git - version: master - lucasw/rqt_topic_display: - type: git - url: git@github.com:lucasw/rqt_topic_display.git - version: master - lucasw/rviz_camera_stream: - type: git - url: git@github.com:lucasw/rviz_camera_stream - version: noetic-devel - lucasw/rviz_interactive_tf: - type: git - url: git@github.com:lucasw/rviz_interactive_tf - version: master - lucasw/rviz_lighting: - type: git - url: git@github.com:lucasw/rviz_lighting - version: cpp17 - lucasw/rviz_ortho_view_controller: - type: git - url: git@github.com:lucasw/rviz_ortho_view_controller.git - version: master lucasw/screengrab_ros: type: git - url: git@github.com:lucasw/screengrab_ros + url: https://github.com/lucasw/screengrab_ros version: master lucasw/signal_generator: type: git - url: git@github.com:lucasw/signal_generator - version: master - lucasw/simple_sim_ros: - type: git - url: git@github.com:lucasw/simple_sim_ros + url: https://github.com/lucasw/signal_generator version: master lucasw/tf_demo: type: git - url: git@github.com:lucasw/tf_demo + url: https://github.com/lucasw/tf_demo version: old_tf_to_new_tf lucasw/timer_test: type: git - url: git@github.com:lucasw/timer_test + url: https://github.com/lucasw/timer_test version: master lucasw/topic_state: type: git - url: git@github.com:lucasw/topic_state + url: https://github.com/lucasw/topic_state version: master lucasw/transform_point_cloud: type: git - url: git@github.com:lucasw/transform_point_cloud.git + url: https://github.com/lucasw/transform_point_cloud version: master lucasw/v4l2ucp: type: git - url: git@github.com:lucasw/v4l2ucp + url: https://github.com/lucasw/v4l2ucp version: master lucasw/vimjay: type: git - url: git@github.com:lucasw/vimjay + url: https://github.com/lucasw/vimjay version: eliminate_build_warnings opencv_apps: type: git - # url: git@github.com:ros-perception/opencv_apps.git - url: git@github.com:muellerbernd/opencv_apps + # url: https://github.com/ros-perception/opencv_apps + url: https://github.com/muellerbernd/opencv_apps version: indigo other/PlotJuggler: type: git - url: git@github.com:facontidavide/PlotJuggler.git + url: https://github.com/facontidavide/PlotJuggler version: main - other/anybotics/elevation_mapping: - type: git - url: git@github.com:ANYbotics/elevation_mapping.git - version: master - other/anybotics/kindr: - type: git - url: git@github.com:ANYbotics/kindr - version: master - other/anybotics/kindr_ros: - type: git - url: git@github.com:lucasw/kindr_ros - version: cpp17 - other/anybotics/message_logger: - type: git - url: git@github.com:lucasw/message_logger - version: line_endings - other/anybotics/point_cloud_io: - type: git - url: git@github.com:ANYbotics/point_cloud_io - version: master other/apriltag_ros: type: git - url: git@github.com:AprilRobotics/apriltag_ros.git + url: https://github.com/AprilRobotics/apriltag_ros version: master other/camera_throttler_nodelets: type: git - url: git@github.com:lucasw/camera_throttler_nodelets.git + url: https://github.com/lucasw/camera_throttler_nodelets version: noetic_aggregated other/catkin_virtualenv: type: git - url: git@github.com:locusrobotics/catkin_virtualenv.git + url: https://github.com/locusrobotics/catkin_virtualenv version: master other/ddynamic_reconfigure: type: git - url: git@github.com:ros-o/ddynamic_reconfigure + url: https://github.com/ros-o/ddynamic_reconfigure version: obese-devel - other/depthai-ros-examples: - type: git - url: git@github.com:luxonis/depthai-ros-examples.git - version: main other/euslisp-release: type: git - url: git@github.com:tork-a/euslisp-release.git + url: https://github.com/tork-a/euslisp-release version: release/melodic/euslisp - other/ffmpeg_image_transport: - type: git - url: git@github.com:lucasw/ffmpeg_image_transport - version: noetic_aggregated - other/ffmpeg_image_transport_msgs: - type: git - url: git@github.com:daniilidis-group/ffmpeg_image_transport_msgs.git - version: master other/fiducials: type: git - url: git@github.com:lucasw/fiducials + url: https://github.com/lucasw/fiducials version: cmake_vision_msgs - other/find-object: - type: git - url: git@github.com:lucasw/find-object.git - version: master - other/fuse: - type: git - url: git@github.com:lucasw/fuse - version: cpp17 # other/geneus: # in underlay_ws # type: git - # url: git@github.com:jsk-ros-pkg/geneus.git + # url: https://github.com/jsk-ros-pkg/geneus # version: master - other/graph_rviz_plugin: - type: git - url: git@github.com:lucasw/graph_rviz_plugin - version: pluginlib_hpp - other/hector_slam: - type: git - url: git@github.com:lucasw/hector_slam - version: boost_placeholders other/jsk_common: type: git - url: git@github.com:lucasw/jsk_common + url: https://github.com/lucasw/jsk_common version: video_to_bag_features other/jsk_common_msgs: type: git - url: git@github.com:lucasw/jsk_common_msgs + url: https://github.com/lucasw/jsk_common_msgs version: master other/jsk_recognition: type: git - url: git@github.com:lucasw/jsk_recognition + url: https://github.com/lucasw/jsk_recognition version: pcl_vtk_isfinite other/jsk_roseus: type: git - url: git@github.com:jsk-ros-pkg/jsk_roseus.git + url: https://github.com/jsk-ros-pkg/jsk_roseus version: master - other/jsk_visualization: - type: git - url: git@github.com:lucasw/jsk_visualization - version: boost_placeholders other/libnabo: type: git - url: git@github.com:ethz-asl/libnabo + url: https://github.com/ethz-asl/libnabo version: master other/lvr2: type: git - url: git@github.com:uos/lvr2 + url: https://github.com/uos/lvr2 version: humble other/marti_messages: type: git - url: git@github.com:swri-robotics/marti_messages.git + url: https://github.com/swri-robotics/marti_messages version: master - other/mavros: - type: git - url: git@github.com:lucasw/mavros - version: master - other/mesh_tools: - type: git - url: git@github.com:lucasw/mesh_tools - version: generate_mesh_geometry other/message_filters: type: git - url: git@github.com:fkie/message_filters.git + url: https://github.com/fkie/message_filters version: master other/nmea_navsat_driver: type: git - url: git@github.com:ros-drivers/nmea_navsat_driver.git + url: https://github.com/ros-drivers/nmea_navsat_driver version: master other/nodelet_rosbag: type: git - url: git@github.com:lucasw/nodelet_rosbag + url: https://github.com/lucasw/nodelet_rosbag version: pluginlib_hpp - other/octomap_mapping: - type: git - url: git@github.com:octomap/octomap_mapping.git - version: kinetic-devel - other/octomap_ros: - type: git - url: git@github.com:octomap/octomap_ros - version: melodic-devel - other/openni2_camera: - type: git - url: git@github.com:lucasw/openni2_camera.git - version: subprocess_wtf_python3_7 other/pal_statistics: type: git - url: git@github.com:pal-robotics/pal_statistics.git + url: https://github.com/pal-robotics/pal_statistics version: kinetic-devel - other/people: - type: git - url: git@github.com:wg-perception/people.git - version: melodic other/pid: type: git - url: git@github.com:lucasw/pid.git + url: https://github.com/lucasw/pid version: boost_placeholders other/plotjuggler-ros-plugins: type: git - url: git@github.com:PlotJuggler/plotjuggler-ros-plugins.git + url: https://github.com/PlotJuggler/plotjuggler-ros-plugins version: main other/plotjuggler_msgs: type: git - url: git@github.com:PlotJuggler/plotjuggler_msgs.git + url: https://github.com/PlotJuggler/plotjuggler_msgs version: main other/point_cloud_converter: type: git - url: git@github.com:pal-robotics-forks/point_cloud_converter.git + url: https://github.com/pal-robotics-forks/point_cloud_converter version: hydro-devel other/ros_control_boilerplate: type: git - url: git@github.com:lucasw/ros_control_boilerplate + url: https://github.com/lucasw/ros_control_boilerplate version: cpp17 other/ros_numpy: type: git - url: git@github.com:lucasw/ros_numpy.git + url: https://github.com/lucasw/ros_numpy version: collections_abc other/ros_rtsp: type: git - url: git@github.com:lucasw/ros_rtsp + url: https://github.com/lucasw/ros_rtsp version: pluginlib_hpp other/ros_type_introspection: type: git - url: git@github.com:lucasw/ros_type_introspection.git + url: https://github.com/lucasw/ros_type_introspection version: build_2204 other/rosbag_snapshot: type: git - url: git@github.com:ros/rosbag_snapshot.git + url: https://github.com/ros/rosbag_snapshot version: main - other/rosboard: - type: git - url: git@github.com:lucasw/rosboard.git - version: patch-1 - other/rosfmt: - type: git - url: git@github.com:lucasw/rosfmt - version: build_2204 - other/rosmon: - type: git - url: git@github.com:lucasw/rosmon - version: build_2204 - other/rosshow: - type: git - url: git@github.com:dheera/rosshow - version: main - other/rqt_ez_publisher: - type: git - url: git@github.com:lucasw/rqt_ez_publisher - version: ubuntu2210 - other/rtabmap: - type: git - url: git@github.com:introlab/rtabmap.git - version: master - other/rtabmap_ros: - type: git - url: git@github.com:introlab/rtabmap_ros - version: master other/static_transform_mux: type: git - url: git@github.com:tradr-project/static_transform_mux.git + url: https://github.com/tradr-project/static_transform_mux version: master other/tf2_2d: type: git - url: git@github.com:locusrobotics/tf2_2d.git + url: https://github.com/locusrobotics/tf2_2d version: devel - other/turtlebot: - type: git - url: git@github.com:turtlebot/turtlebot - version: melodic - other/vdb/openvdb: - type: git - url: git@github.com:AcademySoftwareFoundation/openvdb.git - version: master - other/vdb/vdb_mapping: - type: git - url: git@github.com:lucasw/vdb_mapping - version: ubuntu_2404 - other/vdb/vdb_mapping_ros: - type: git - url: git@github.com:lucasw/vdb_mapping_ros - version: rolling_window other/wu_ros_tools: type: git - url: git@github.com:lucasw/wu_ros_tools + url: https://github.com/lucasw/wu_ros_tools version: noetic - ros/async_web_server_cpp: - type: git - url: git@github.com:lucasw/async_web_server_cpp.git - version: ros1-develop ros/audio_common: type: git - url: git@github.com:ros-drivers/audio_common.git + url: https://github.com/ros-drivers/audio_common version: master ros/camera_info_manager_py: type: git - url: git@github.com:lucasw/camera_info_manager_py + url: https://github.com/lucasw/camera_info_manager_py version: noetic-devel ros/common_tutorials: type: git - url: git@github.com:lucasw/common_tutorials.git + url: https://github.com/lucasw/common_tutorials version: boost_placeholders ros/control_msgs: type: git - url: git@github.com:ros-controls/control_msgs.git + url: https://github.com/ros-controls/control_msgs version: kinetic-devel ros/ddynamic_reconfigure_python: type: git - url: git@github.com:pal-robotics/ddynamic_reconfigure_python + url: https://github.com/pal-robotics/ddynamic_reconfigure_python version: master ros/diagnostics: type: git - url: git@github.com:ros/diagnostics.git + url: https://github.com/ros/diagnostics version: noetic-devel ros/dynamic_reconfigure: type: git - url: git@github.com:lucasw/dynamic_reconfigure + url: https://github.com/lucasw/dynamic_reconfigure version: init_default_values ros/filters: type: git - url: git@github.com:ros/filters.git + url: https://github.com/ros/filters version: noetic-devel ros/four_wheel_steering_msgs: type: git - url: git@github.com:ros-drivers/four_wheel_steering_msgs.git + url: https://github.com/ros-drivers/four_wheel_steering_msgs version: master - ros/gazebo_ros_demos: - type: git - url: git@github.com:lucasw/gazebo_ros_demos - version: noetic-devel - ros/gazebo_ros_pkgs: - type: git - url: git@github.com:lucasw/gazebo_ros_pkgs - version: noetic_debug_plugins ros/geographic_info: type: git - url: git@github.com:ros-geographic-info/geographic_info.git + url: https://github.com/ros-geographic-info/geographic_info version: master # ros/geometry2: # in underlay_ws # type: git - # url: git@github.com:lucasw/geometry2 + # url: https://github.com/lucasw/geometry2 # version: noetic_aggregated ros/grid_map: type: git - url: git@github.com:lucasw/grid_map + url: https://github.com/lucasw/grid_map version: tbb_2021 ros/image_common: type: git - url: git@github.com:lucasw/image_common + url: https://github.com/lucasw/image_common version: ubuntu_2210 ros/image_pipeline: type: git - url: git@github.com:lucasw/image_pipeline + url: https://github.com/lucasw/image_pipeline version: rgb_in_depth_range ros/image_transport_plugins: type: git - url: git@github.com:lucasw/image_transport_plugins + url: https://github.com/lucasw/image_transport_plugins version: enable_pub - ros/interactive_markers: - type: git - url: git@github.com:ros-visualization/interactive_markers.git - version: noetic-devel ros/joint_state_publisher: type: git - url: git@github.com:lucasw/joint_state_publisher + url: https://github.com/lucasw/joint_state_publisher version: noetic_aggregated ros/joystick_drivers: type: git - url: git@github.com:lucasw/joystick_drivers + url: https://github.com/lucasw/joystick_drivers version: warn_not_error_if_no_joy ros/laser_assembler: type: git - url: git@github.com:lucasw/laser_assembler + url: https://github.com/lucasw/laser_assembler version: noetic-devel ros/libuvc_ros: type: git - url: git@github.com:lucasw/libuvc_ros.git + url: https://github.com/lucasw/libuvc_ros version: libuvc_0_0_7 ros/media_export: type: git - url: git@github.com:ros/media_export.git + url: https://github.com/ros/media_export version: kinetic-devel ros/navigation: type: git - url: git@github.com:lucasw/navigation + url: https://github.com/lucasw/navigation version: lucasw_debug ros/nmea_msgs: type: git - url: git@github.com:ros-drivers/nmea_msgs + url: https://github.com/ros-drivers/nmea_msgs version: master ros/nodelet_core: type: git - url: git@github.com:lucasw/nodelet_core.git + url: https://github.com/lucasw/nodelet_core version: throttle_looping_time ros/octomap_msgs: type: git - url: git@github.com:OctoMap/octomap_msgs.git + url: https://github.com/OctoMap/octomap_msgs version: melodic-devel ros/realtime_tools: type: git - url: git@github.com:ros-controls/realtime_tools.git + url: https://github.com/ros-controls/realtime_tools version: noetic-devel - ros/robot_localization: - type: git - url: git@github.com:lucasw/robot_localization - version: boost_placeholders_cpp17 ros/robot_state_publisher: type: git - url: git@github.com:lucasw/robot_state_publisher + url: https://github.com/lucasw/robot_state_publisher version: robot_state_function ros/ros_comm: # custom overlay with logging mods type: git - url: git@github.com:lucasw/ros_comm + url: https://github.com/lucasw/ros_comm version: salsa_noetic_aggregated ros/ros_control: type: git - url: git@github.com:lucasw/ros_control + url: https://github.com/lucasw/ros_control version: acceleration_limits ros/ros_controllers: type: git - url: git@github.com:lucasw/ros_controllers + url: https://github.com/lucasw/ros_controllers version: avoid_no_trajectory_defined ros/ros_tutorials: type: git - url: git@github.com:lucasw/ros_tutorials.git + url: https://github.com/lucasw/ros_tutorials version: boost_placeholders ros/rosconsole: # lucasw logging mods type: git - url: git@github.com:lucasw/rosconsole + url: https://github.com/lucasw/rosconsole version: ubuntu_2210 ros/roscpp_core: # lucasw fixes type: git - url: git@github.com:lucasw/roscpp_core + url: https://github.com/lucasw/roscpp_core version: duration_out_of_dual_range ros/rospack: # debian patches type: git - url: git@github.com:lucasw/rospack + url: https://github.com/lucasw/rospack version: salsa ros/rqt: type: git - url: git@github.com:lucasw/rqt + url: https://github.com/lucasw/rqt version: ubuntu_2210 - ros/rqt_bag: - type: git - url: git@github.com:lucasw/rqt_bag - version: build_2204 - ros/rqt_console: - type: git - url: git@github.com:ros-visualization/rqt_console.git - version: master - ros/rqt_graph: - type: git - url: git@github.com:ros-visualization/rqt_graph.git - version: master - ros/rqt_logger_level: - type: git - url: git@github.com:ros-visualization/rqt_logger_level.git - version: master - ros/rqt_plot: - type: git - url: git@github.com:ros-visualization/rqt_plot.git - version: master - ros/rqt_reconfigure: - type: git - url: https://github.com/ros-visualization/rqt_reconfigure - version: master - ros/rqt_robot_monitor: - type: git - url: git@github.com:ros-visualization/rqt_robot_monitor.git - version: ros1 - ros/rqt_robot_steering: - type: git - url: git@github.com:lucasw/rqt_robot_steering.git - version: python310 - ros/rqt_tf_tree: - type: git - url: git@github.com:ros-visualization/rqt_tf_tree.git - version: master - ros/rviz: - type: git - url: git@github.com:lucasw/rviz.git - version: misc_fixes ros/teleop_twist_joy: type: git - url: git@github.com:lucasw/teleop_twist_joy + url: https://github.com/lucasw/teleop_twist_joy version: cmp0115_cpp_extension ros/teleop_twist_keyboard: type: git - url: git@github.com:ros-teleop/teleop_twist_keyboard.git + url: https://github.com/ros-teleop/teleop_twist_keyboard version: master ros/twist_mux: type: git - url: git@github.com:lucasw/twist_mux + url: https://github.com/lucasw/twist_mux version: ubuntu2210 ros/twist_mux_msgs: type: git - url: git@github.com:ros-teleop/twist_mux_msgs + url: https://github.com/ros-teleop/twist_mux_msgs version: melodic-devel ros/unique_identifier: type: git - url: git@github.com:ros-geographic-info/unique_identifier.git + url: https://github.com/ros-geographic-info/unique_identifier version: master ros/urdf_geometry_parser: type: git - url: git@github.com:ros-controls/urdf_geometry_parser.git + url: https://github.com/ros-controls/urdf_geometry_parser version: kinetic-devel ros/urdf_parser_py: type: git - url: git@github.com:ros/urdf_parser_py.git + url: https://github.com/ros/urdf_parser_py version: melodic-devel ros/usb_cam: type: git - url: git@github.com:ros-drivers/usb_cam.git + url: https://github.com/ros-drivers/usb_cam version: develop ros/video_stream_opencv: type: git - url: git@github.com:lucasw/video_stream_opencv + url: https://github.com/lucasw/video_stream_opencv version: build_2204 ros/view_controller_msgs: type: git - url: git@github.com:ros-visualization/view_controller_msgs.git + url: https://github.com/ros-visualization/view_controller_msgs version: lunar-devel ros/vision_msgs: type: git - url: git@github.com:ros-perception/vision_msgs.git + url: https://github.com/ros-perception/vision_msgs version: noetic-devel ros/web_video_server: type: git - url: git@github.com:lucasw/web_video_server + url: https://github.com/lucasw/web_video_server version: boost_placeholders ros/xacro: type: git - url: git@github.com:lucasw/xacro.git + url: https://github.com/lucasw/xacro version: cleanup_roslint roso/control_toolbox: type: git - url: git@github.com:ros-o/control_toolbox + url: https://github.com/ros-o/control_toolbox version: obese-devel roso/qt_gui_core: type: git - url: git@github.com:lucasw/qt_gui_core + url: https://github.com/lucasw/qt_gui_core version: ubuntu_2210 roso/rosparam_shortcuts: type: git - url: git@github.com:lucasw/rosparam_shortcuts + url: https://github.com/lucasw/rosparam_shortcuts version: cleanup_lint - roso/rqt_image_view: - type: git - url: git@github.com:lucasw/rqt_image_view - version: detection2d_image_view diff --git a/ubuntu_2404/dependencies.sh b/ubuntu_2404/dependencies.sh new file mode 100755 index 0000000..11eb683 --- /dev/null +++ b/ubuntu_2404/dependencies.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +apt-get install -yq libb64-dev libboost-iostreams-dev libboost-test-dev libboost-timer-dev libcgal-dev libgdal-dev libopencv-dev liboctomap-dev libpcl-dev libvtk9-dev sip-dev diff --git a/ubuntu_2404/extra_repos.yaml b/ubuntu_2404/extra_repos.yaml new file mode 100644 index 0000000..5c8469e --- /dev/null +++ b/ubuntu_2404/extra_repos.yaml @@ -0,0 +1,678 @@ +repositories: + clearpath/cpr_gazebo: + type: git + url: https://github.com/clearpathrobotics/cpr_gazebo.git + version: noetic-devel + clearpath/husky: + type: git + url: git@github.com:lucasw/husky + version: roslint_fixes + clearpath/moose: + type: git + url: git@github.com:lucasw/moose + version: pluginlib_hpp + clearpath/moose_simulator: + type: git + url: git@github.com:moose-cpr/moose_simulator.git + version: master + clearpath/warthog: + type: git + url: git@github.com:warthog-cpr/warthog + version: kinetic-devel + clearpath/warthog_simulator: + type: git + url: git@github.com:warthog-cpr/warthog_simulator.git + version: melodic-devel + # extra/common_msgs: # in underlay_ws + # type: git + # url: git@github.com:ros/common_msgs.git + # version: noetic-devel + # extra/geometry: + # type: git + # url: git@github.com:ros-o/geometry.git + # version: obese-devel + extra/laser_geometry: + type: git + url: git@github.com:ros-o/laser_geometry.git + version: obese-devel + extra/navigation_msgs: + type: git + url: git@github.com:ros-planning/navigation_msgs.git + version: ros1 + extra/pcl_msgs: + type: git + url: git@github.com:ros-perception/pcl_msgs.git + version: noetic-devel + extra/perception_pcl: + type: git + url: git@github.com:ros-o/perception_pcl.git + version: obese-devel + extra/python_qt_binding: + type: git + url: git@github.com:ros-o/python_qt_binding.git + version: obese-devel + extra/vision_opencv: + type: git + url: git@github.com:ros-perception/vision_opencv.git + version: noetic + greenzie/boustrophedon_planner: + type: git + url: git@github.com:lucasw/boustrophedon_planner + version: cpp17 + lucasw/carbot: + type: git + url: git@github.com:lucasw/carbot + version: master + lucasw/dynamic_reconfigure_tools: + type: git + url: git@github.com:lucasw/dynamic_reconfigure_tools + version: master + lucasw/frei0r_image: + type: git + url: git@github.com:lucasw/frei0r_image + version: master + lucasw/image_manip: + type: git + url: git@github.com:lucasw/image_manip + version: fix_zero_frame_rate + lucasw/joy_feedback_ros: + type: git + url: git@github.com:lucasw/joy_feedback_ros + version: master + lucasw/nodelet_demo: + type: git + url: git@github.com:lucasw/nodelet_demo + version: master + lucasw/popcanbot: + type: git + url: git@github.com:lucasw/popcanbot + version: master + lucasw/ros1_lifecycle: + type: git + url: git@github.com:lucasw/ros1_lifecycle + version: misc_fixes + lucasw/ros_example: + type: git + url: git@github.com:lucasw/ros_example + version: main + lucasw/ros_system_monitor: + type: git + url: git@github.com:lucasw/ros_system_monitor + version: chrony_monitor + lucasw/rqt_file_dialog: + type: git + url: git@github.com:lucasw/rqt_file_dialog + version: master + lucasw/rqt_tf_echo: + type: git + url: git@github.com:lucasw/rqt_tf_echo.git + version: master + lucasw/rqt_topic_display: + type: git + url: git@github.com:lucasw/rqt_topic_display.git + version: master + lucasw/rviz_camera_stream: + type: git + url: git@github.com:lucasw/rviz_camera_stream + version: noetic-devel + lucasw/rviz_interactive_tf: + type: git + url: git@github.com:lucasw/rviz_interactive_tf + version: master + lucasw/rviz_lighting: + type: git + url: git@github.com:lucasw/rviz_lighting + version: cpp17 + lucasw/rviz_ortho_view_controller: + type: git + url: git@github.com:lucasw/rviz_ortho_view_controller.git + version: master + lucasw/screengrab_ros: + type: git + url: git@github.com:lucasw/screengrab_ros + version: master + lucasw/signal_generator: + type: git + url: git@github.com:lucasw/signal_generator + version: master + lucasw/simple_sim_ros: + type: git + url: git@github.com:lucasw/simple_sim_ros + version: master + lucasw/tf_demo: + type: git + url: git@github.com:lucasw/tf_demo + version: old_tf_to_new_tf + lucasw/timer_test: + type: git + url: git@github.com:lucasw/timer_test + version: master + lucasw/topic_state: + type: git + url: git@github.com:lucasw/topic_state + version: master + lucasw/transform_point_cloud: + type: git + url: git@github.com:lucasw/transform_point_cloud.git + version: master + lucasw/v4l2ucp: + type: git + url: git@github.com:lucasw/v4l2ucp + version: master + lucasw/vimjay: + type: git + url: git@github.com:lucasw/vimjay + version: eliminate_build_warnings + opencv_apps: + type: git + # url: git@github.com:ros-perception/opencv_apps.git + url: git@github.com:muellerbernd/opencv_apps + version: indigo + other/PlotJuggler: + type: git + url: git@github.com:facontidavide/PlotJuggler.git + version: main + other/anybotics/elevation_mapping: + type: git + url: git@github.com:ANYbotics/elevation_mapping.git + version: master + other/anybotics/kindr: + type: git + url: git@github.com:ANYbotics/kindr + version: master + other/anybotics/kindr_ros: + type: git + url: git@github.com:lucasw/kindr_ros + version: cpp17 + other/anybotics/message_logger: + type: git + url: git@github.com:lucasw/message_logger + version: line_endings + other/anybotics/point_cloud_io: + type: git + url: git@github.com:ANYbotics/point_cloud_io + version: master + other/apriltag_ros: + type: git + url: git@github.com:AprilRobotics/apriltag_ros.git + version: master + other/camera_throttler_nodelets: + type: git + url: git@github.com:lucasw/camera_throttler_nodelets.git + version: noetic_aggregated + other/catkin_virtualenv: + type: git + url: git@github.com:locusrobotics/catkin_virtualenv.git + version: master + other/ddynamic_reconfigure: + type: git + url: git@github.com:ros-o/ddynamic_reconfigure + version: obese-devel + other/depthai-ros-examples: + type: git + url: git@github.com:luxonis/depthai-ros-examples.git + version: main + other/euslisp-release: + type: git + url: git@github.com:tork-a/euslisp-release.git + version: release/melodic/euslisp + other/ffmpeg_image_transport: + type: git + url: git@github.com:lucasw/ffmpeg_image_transport + version: noetic_aggregated + other/ffmpeg_image_transport_msgs: + type: git + url: git@github.com:daniilidis-group/ffmpeg_image_transport_msgs.git + version: master + other/fiducials: + type: git + url: git@github.com:lucasw/fiducials + version: cmake_vision_msgs + other/find-object: + type: git + url: git@github.com:lucasw/find-object.git + version: master + other/fuse: + type: git + url: git@github.com:lucasw/fuse + version: cpp17 + # other/geneus: # in underlay_ws + # type: git + # url: git@github.com:jsk-ros-pkg/geneus.git + # version: master + other/graph_rviz_plugin: + type: git + url: git@github.com:lucasw/graph_rviz_plugin + version: pluginlib_hpp + other/hector_slam: + type: git + url: git@github.com:lucasw/hector_slam + version: boost_placeholders + other/jsk_common: + type: git + url: git@github.com:lucasw/jsk_common + version: video_to_bag_features + other/jsk_common_msgs: + type: git + url: git@github.com:lucasw/jsk_common_msgs + version: master + other/jsk_recognition: + type: git + url: git@github.com:lucasw/jsk_recognition + version: pcl_vtk_isfinite + other/jsk_roseus: + type: git + url: git@github.com:jsk-ros-pkg/jsk_roseus.git + version: master + other/jsk_visualization: + type: git + url: git@github.com:lucasw/jsk_visualization + version: boost_placeholders + other/libnabo: + type: git + url: git@github.com:ethz-asl/libnabo + version: master + other/lvr2: + type: git + url: git@github.com:uos/lvr2 + version: humble + other/marti_messages: + type: git + url: git@github.com:swri-robotics/marti_messages.git + version: master + other/mavros: + type: git + url: git@github.com:lucasw/mavros + version: master + other/mesh_tools: + type: git + url: git@github.com:lucasw/mesh_tools + version: generate_mesh_geometry + other/message_filters: + type: git + url: git@github.com:fkie/message_filters.git + version: master + other/nmea_navsat_driver: + type: git + url: git@github.com:ros-drivers/nmea_navsat_driver.git + version: master + other/nodelet_rosbag: + type: git + url: git@github.com:lucasw/nodelet_rosbag + version: pluginlib_hpp + other/octomap_mapping: + type: git + url: git@github.com:octomap/octomap_mapping.git + version: kinetic-devel + other/octomap_ros: + type: git + url: git@github.com:octomap/octomap_ros + version: melodic-devel + other/openni2_camera: + type: git + url: git@github.com:lucasw/openni2_camera.git + version: subprocess_wtf_python3_7 + other/pal_statistics: + type: git + url: git@github.com:pal-robotics/pal_statistics.git + version: kinetic-devel + other/people: + type: git + url: git@github.com:wg-perception/people.git + version: melodic + other/pid: + type: git + url: git@github.com:lucasw/pid.git + version: boost_placeholders + other/plotjuggler-ros-plugins: + type: git + url: git@github.com:PlotJuggler/plotjuggler-ros-plugins.git + version: main + other/plotjuggler_msgs: + type: git + url: git@github.com:PlotJuggler/plotjuggler_msgs.git + version: main + other/point_cloud_converter: + type: git + url: git@github.com:pal-robotics-forks/point_cloud_converter.git + version: hydro-devel + other/ros_control_boilerplate: + type: git + url: git@github.com:lucasw/ros_control_boilerplate + version: cpp17 + other/ros_numpy: + type: git + url: git@github.com:lucasw/ros_numpy.git + version: collections_abc + other/ros_rtsp: + type: git + url: git@github.com:lucasw/ros_rtsp + version: pluginlib_hpp + other/ros_type_introspection: + type: git + url: git@github.com:lucasw/ros_type_introspection.git + version: build_2204 + other/rosbag_snapshot: + type: git + url: git@github.com:ros/rosbag_snapshot.git + version: main + other/rosboard: + type: git + url: git@github.com:lucasw/rosboard.git + version: patch-1 + other/rosfmt: + type: git + url: git@github.com:lucasw/rosfmt + version: build_2204 + other/rosmon: + type: git + url: git@github.com:lucasw/rosmon + version: build_2204 + other/rosshow: + type: git + url: git@github.com:dheera/rosshow + version: main + other/rqt_ez_publisher: + type: git + url: git@github.com:lucasw/rqt_ez_publisher + version: ubuntu2210 + other/rtabmap: + type: git + url: git@github.com:introlab/rtabmap.git + version: master + other/rtabmap_ros: + type: git + url: git@github.com:introlab/rtabmap_ros + version: master + other/static_transform_mux: + type: git + url: git@github.com:tradr-project/static_transform_mux.git + version: master + other/tf2_2d: + type: git + url: git@github.com:locusrobotics/tf2_2d.git + version: devel + other/turtlebot: + type: git + url: git@github.com:turtlebot/turtlebot + version: melodic + other/vdb/openvdb: + type: git + url: git@github.com:AcademySoftwareFoundation/openvdb.git + version: master + other/vdb/vdb_mapping: + type: git + url: git@github.com:lucasw/vdb_mapping + version: ubuntu_2404 + other/vdb/vdb_mapping_ros: + type: git + url: git@github.com:lucasw/vdb_mapping_ros + version: rolling_window + other/wu_ros_tools: + type: git + url: git@github.com:lucasw/wu_ros_tools + version: noetic + ros/async_web_server_cpp: + type: git + url: git@github.com:lucasw/async_web_server_cpp.git + version: ros1-develop + ros/audio_common: + type: git + url: git@github.com:ros-drivers/audio_common.git + version: master + ros/camera_info_manager_py: + type: git + url: git@github.com:lucasw/camera_info_manager_py + version: noetic-devel + ros/common_tutorials: + type: git + url: git@github.com:lucasw/common_tutorials.git + version: boost_placeholders + ros/control_msgs: + type: git + url: git@github.com:ros-controls/control_msgs.git + version: kinetic-devel + ros/ddynamic_reconfigure_python: + type: git + url: git@github.com:pal-robotics/ddynamic_reconfigure_python + version: master + ros/diagnostics: + type: git + url: git@github.com:ros/diagnostics.git + version: noetic-devel + ros/dynamic_reconfigure: + type: git + url: git@github.com:lucasw/dynamic_reconfigure + version: init_default_values + ros/filters: + type: git + url: git@github.com:ros/filters.git + version: noetic-devel + ros/four_wheel_steering_msgs: + type: git + url: git@github.com:ros-drivers/four_wheel_steering_msgs.git + version: master + ros/gazebo_ros_demos: + type: git + url: git@github.com:lucasw/gazebo_ros_demos + version: noetic-devel + ros/gazebo_ros_pkgs: + type: git + url: git@github.com:lucasw/gazebo_ros_pkgs + version: noetic_debug_plugins + ros/geographic_info: + type: git + url: git@github.com:ros-geographic-info/geographic_info.git + version: master + # ros/geometry2: # in underlay_ws + # type: git + # url: git@github.com:lucasw/geometry2 + # version: noetic_aggregated + ros/grid_map: + type: git + url: git@github.com:lucasw/grid_map + version: tbb_2021 + ros/image_common: + type: git + url: git@github.com:lucasw/image_common + version: ubuntu_2210 + ros/image_pipeline: + type: git + url: git@github.com:lucasw/image_pipeline + version: rgb_in_depth_range + ros/image_transport_plugins: + type: git + url: git@github.com:lucasw/image_transport_plugins + version: enable_pub + ros/interactive_markers: + type: git + url: git@github.com:ros-visualization/interactive_markers.git + version: noetic-devel + ros/joint_state_publisher: + type: git + url: git@github.com:lucasw/joint_state_publisher + version: noetic_aggregated + ros/joystick_drivers: + type: git + url: git@github.com:lucasw/joystick_drivers + version: warn_not_error_if_no_joy + ros/laser_assembler: + type: git + url: git@github.com:lucasw/laser_assembler + version: noetic-devel + ros/libuvc_ros: + type: git + url: git@github.com:lucasw/libuvc_ros.git + version: libuvc_0_0_7 + ros/media_export: + type: git + url: git@github.com:ros/media_export.git + version: kinetic-devel + ros/navigation: + type: git + url: git@github.com:lucasw/navigation + version: lucasw_debug + ros/nmea_msgs: + type: git + url: git@github.com:ros-drivers/nmea_msgs + version: master + ros/nodelet_core: + type: git + url: git@github.com:lucasw/nodelet_core.git + version: throttle_looping_time + ros/octomap_msgs: + type: git + url: git@github.com:OctoMap/octomap_msgs.git + version: melodic-devel + ros/realtime_tools: + type: git + url: git@github.com:ros-controls/realtime_tools.git + version: noetic-devel + ros/robot_localization: + type: git + url: git@github.com:lucasw/robot_localization + version: boost_placeholders_cpp17 + ros/robot_state_publisher: + type: git + url: git@github.com:lucasw/robot_state_publisher + version: robot_state_function + ros/ros_comm: # custom overlay with logging mods + type: git + url: git@github.com:lucasw/ros_comm + version: salsa_noetic_aggregated + ros/ros_control: + type: git + url: git@github.com:lucasw/ros_control + version: acceleration_limits + ros/ros_controllers: + type: git + url: git@github.com:lucasw/ros_controllers + version: avoid_no_trajectory_defined + ros/ros_tutorials: + type: git + url: git@github.com:lucasw/ros_tutorials.git + version: boost_placeholders + ros/rosconsole: # lucasw logging mods + type: git + url: git@github.com:lucasw/rosconsole + version: ubuntu_2210 + ros/roscpp_core: # lucasw fixes + type: git + url: git@github.com:lucasw/roscpp_core + version: duration_out_of_dual_range + ros/rospack: # debian patches + type: git + url: git@github.com:lucasw/rospack + version: salsa + ros/rqt: + type: git + url: git@github.com:lucasw/rqt + version: ubuntu_2210 + ros/rqt_bag: + type: git + url: git@github.com:lucasw/rqt_bag + version: build_2204 + ros/rqt_console: + type: git + url: git@github.com:ros-visualization/rqt_console.git + version: master + ros/rqt_graph: + type: git + url: git@github.com:ros-visualization/rqt_graph.git + version: master + ros/rqt_logger_level: + type: git + url: git@github.com:ros-visualization/rqt_logger_level.git + version: master + ros/rqt_plot: + type: git + url: git@github.com:ros-visualization/rqt_plot.git + version: master + ros/rqt_reconfigure: + type: git + url: https://github.com/ros-visualization/rqt_reconfigure + version: master + ros/rqt_robot_monitor: + type: git + url: git@github.com:ros-visualization/rqt_robot_monitor.git + version: ros1 + ros/rqt_robot_steering: + type: git + url: git@github.com:lucasw/rqt_robot_steering.git + version: python310 + ros/rqt_tf_tree: + type: git + url: git@github.com:ros-visualization/rqt_tf_tree.git + version: master + ros/rviz: + type: git + url: git@github.com:lucasw/rviz.git + version: misc_fixes + ros/teleop_twist_joy: + type: git + url: git@github.com:lucasw/teleop_twist_joy + version: cmp0115_cpp_extension + ros/teleop_twist_keyboard: + type: git + url: git@github.com:ros-teleop/teleop_twist_keyboard.git + version: master + ros/twist_mux: + type: git + url: git@github.com:lucasw/twist_mux + version: ubuntu2210 + ros/twist_mux_msgs: + type: git + url: git@github.com:ros-teleop/twist_mux_msgs + version: melodic-devel + ros/unique_identifier: + type: git + url: git@github.com:ros-geographic-info/unique_identifier.git + version: master + ros/urdf_geometry_parser: + type: git + url: git@github.com:ros-controls/urdf_geometry_parser.git + version: kinetic-devel + ros/urdf_parser_py: + type: git + url: git@github.com:ros/urdf_parser_py.git + version: melodic-devel + ros/usb_cam: + type: git + url: git@github.com:ros-drivers/usb_cam.git + version: develop + ros/video_stream_opencv: + type: git + url: git@github.com:lucasw/video_stream_opencv + version: build_2204 + ros/view_controller_msgs: + type: git + url: git@github.com:ros-visualization/view_controller_msgs.git + version: lunar-devel + ros/vision_msgs: + type: git + url: git@github.com:ros-perception/vision_msgs.git + version: noetic-devel + ros/web_video_server: + type: git + url: git@github.com:lucasw/web_video_server + version: boost_placeholders + ros/xacro: + type: git + url: git@github.com:lucasw/xacro.git + version: cleanup_roslint + roso/control_toolbox: + type: git + url: git@github.com:ros-o/control_toolbox + version: obese-devel + roso/qt_gui_core: + type: git + url: git@github.com:lucasw/qt_gui_core + version: ubuntu_2210 + roso/rosparam_shortcuts: + type: git + url: git@github.com:lucasw/rosparam_shortcuts + version: cleanup_lint + roso/rqt_image_view: + type: git + url: git@github.com:lucasw/rqt_image_view + version: detection2d_image_view diff --git a/ubuntu_2404/rqt_rviz_repos.yaml b/ubuntu_2404/rqt_rviz_repos.yaml new file mode 100644 index 0000000..265eeb6 --- /dev/null +++ b/ubuntu_2404/rqt_rviz_repos.yaml @@ -0,0 +1,506 @@ +repositories: + # extra/common_msgs: # in underlay_ws + # type: git + # url: https://github.com/ros/common_msgs + # version: noetic-devel + # extra/geometry: + # type: git + # url: https://github.com/ros-o/geometry + # version: obese-devel + extra/laser_geometry: + type: git + url: https://github.com/ros-o/laser_geometry + version: obese-devel + extra/navigation_msgs: + type: git + url: https://github.com/ros-planning/navigation_msgs + version: ros1 + extra/pcl_msgs: + type: git + url: https://github.com/ros-perception/pcl_msgs + version: noetic-devel + extra/perception_pcl: + type: git + url: https://github.com/ros-o/perception_pcl + version: obese-devel + extra/python_qt_binding: + type: git + url: https://github.com/ros-o/python_qt_binding + version: obese-devel + extra/vision_opencv: + type: git + url: https://github.com/ros-perception/vision_opencv + version: noetic + lucasw/dynamic_reconfigure_tools: + type: git + url: https://github.com/lucasw/dynamic_reconfigure_tools + version: master + lucasw/image_manip: + type: git + url: https://github.com/lucasw/image_manip + version: fix_zero_frame_rate + lucasw/nodelet_demo: + type: git + url: https://github.com/lucasw/nodelet_demo + version: master + lucasw/ros1_lifecycle: + type: git + url: https://github.com/lucasw/ros1_lifecycle + version: misc_fixes + lucasw/ros_example: + type: git + url: https://github.com/lucasw/ros_example + version: main + lucasw/ros_system_monitor: + type: git + url: https://github.com/lucasw/ros_system_monitor + version: chrony_monitor + lucasw/rqt_file_dialog: + type: git + url: https://github.com/lucasw/rqt_file_dialog + version: master + lucasw/rqt_tf_echo: + type: git + url: https://github.com/lucasw/rqt_tf_echo + version: master + lucasw/rqt_topic_display: + type: git + url: https://github.com/lucasw/rqt_topic_display + version: master + lucasw/rviz_camera_stream: + type: git + url: https://github.com/lucasw/rviz_camera_stream + version: noetic-devel + lucasw/rviz_interactive_tf: + type: git + url: https://github.com/lucasw/rviz_interactive_tf + version: master + lucasw/rviz_lighting: + type: git + url: https://github.com/lucasw/rviz_lighting + version: cpp17 + lucasw/rviz_ortho_view_controller: + type: git + url: https://github.com/lucasw/rviz_ortho_view_controller + version: master + lucasw/screengrab_ros: + type: git + url: https://github.com/lucasw/screengrab_ros + version: master + lucasw/signal_generator: + type: git + url: https://github.com/lucasw/signal_generator + version: master + lucasw/tf_demo: + type: git + url: https://github.com/lucasw/tf_demo + version: old_tf_to_new_tf + lucasw/timer_test: + type: git + url: https://github.com/lucasw/timer_test + version: master + lucasw/topic_state: + type: git + url: https://github.com/lucasw/topic_state + version: master + lucasw/transform_point_cloud: + type: git + url: https://github.com/lucasw/transform_point_cloud + version: master + lucasw/v4l2ucp: + type: git + url: https://github.com/lucasw/v4l2ucp + version: master + lucasw/vimjay: + type: git + url: https://github.com/lucasw/vimjay + version: eliminate_build_warnings + opencv_apps: + type: git + # url: https://github.com/ros-perception/opencv_apps + url: https://github.com/muellerbernd/opencv_apps + version: indigo + other/PlotJuggler: + type: git + url: https://github.com/facontidavide/PlotJuggler + version: main + other/apriltag_ros: + type: git + url: https://github.com/AprilRobotics/apriltag_ros + version: master + other/camera_throttler_nodelets: + type: git + url: https://github.com/lucasw/camera_throttler_nodelets + version: noetic_aggregated + other/catkin_virtualenv: + type: git + url: https://github.com/locusrobotics/catkin_virtualenv + version: master + other/ddynamic_reconfigure: + type: git + url: https://github.com/ros-o/ddynamic_reconfigure + version: obese-devel + other/euslisp-release: + type: git + url: https://github.com/tork-a/euslisp-release + version: release/melodic/euslisp + other/fiducials: + type: git + url: https://github.com/lucasw/fiducials + version: cmake_vision_msgs + # other/geneus: # in underlay_ws + # type: git + # url: https://github.com/jsk-ros-pkg/geneus + # version: master + other/graph_rviz_plugin: + type: git + url: https://github.com/lucasw/graph_rviz_plugin + version: pluginlib_hpp + other/jsk_common: + type: git + url: https://github.com/lucasw/jsk_common + version: video_to_bag_features + other/jsk_common_msgs: + type: git + url: https://github.com/lucasw/jsk_common_msgs + version: master + other/jsk_recognition: + type: git + url: https://github.com/lucasw/jsk_recognition + version: pcl_vtk_isfinite + other/jsk_roseus: + type: git + url: https://github.com/jsk-ros-pkg/jsk_roseus + version: master + other/jsk_visualization: + type: git + url: https://github.com/lucasw/jsk_visualization + version: boost_placeholders + other/libnabo: + type: git + url: https://github.com/ethz-asl/libnabo + version: master + other/lvr2: + type: git + url: https://github.com/uos/lvr2 + version: humble + other/marti_messages: + type: git + url: https://github.com/swri-robotics/marti_messages + version: master + other/message_filters: + type: git + url: https://github.com/fkie/message_filters + version: master + other/nmea_navsat_driver: + type: git + url: https://github.com/ros-drivers/nmea_navsat_driver + version: master + other/nodelet_rosbag: + type: git + url: https://github.com/lucasw/nodelet_rosbag + version: pluginlib_hpp + other/pal_statistics: + type: git + url: https://github.com/pal-robotics/pal_statistics + version: kinetic-devel + other/pid: + type: git + url: https://github.com/lucasw/pid + version: boost_placeholders + other/plotjuggler-ros-plugins: + type: git + url: https://github.com/PlotJuggler/plotjuggler-ros-plugins + version: main + other/plotjuggler_msgs: + type: git + url: https://github.com/PlotJuggler/plotjuggler_msgs + version: main + other/point_cloud_converter: + type: git + url: https://github.com/pal-robotics-forks/point_cloud_converter + version: hydro-devel + other/ros_control_boilerplate: + type: git + url: https://github.com/lucasw/ros_control_boilerplate + version: cpp17 + other/ros_numpy: + type: git + url: https://github.com/lucasw/ros_numpy + version: collections_abc + other/ros_rtsp: + type: git + url: https://github.com/lucasw/ros_rtsp + version: pluginlib_hpp + other/ros_type_introspection: + type: git + url: https://github.com/lucasw/ros_type_introspection + version: build_2204 + other/rosbag_snapshot: + type: git + url: https://github.com/ros/rosbag_snapshot + version: main + other/rqt_ez_publisher: + type: git + url: https://github.com/lucasw/rqt_ez_publisher + version: ubuntu2210 + other/static_transform_mux: + type: git + url: https://github.com/tradr-project/static_transform_mux + version: master + other/tf2_2d: + type: git + url: https://github.com/locusrobotics/tf2_2d + version: devel + other/wu_ros_tools: + type: git + url: https://github.com/lucasw/wu_ros_tools + version: noetic + ros/audio_common: + type: git + url: https://github.com/ros-drivers/audio_common + version: master + ros/camera_info_manager_py: + type: git + url: https://github.com/lucasw/camera_info_manager_py + version: noetic-devel + ros/common_tutorials: + type: git + url: https://github.com/lucasw/common_tutorials + version: boost_placeholders + ros/control_msgs: + type: git + url: https://github.com/ros-controls/control_msgs + version: kinetic-devel + ros/ddynamic_reconfigure_python: + type: git + url: https://github.com/pal-robotics/ddynamic_reconfigure_python + version: master + ros/diagnostics: + type: git + url: https://github.com/ros/diagnostics + version: noetic-devel + ros/dynamic_reconfigure: + type: git + url: https://github.com/lucasw/dynamic_reconfigure + version: init_default_values + ros/filters: + type: git + url: https://github.com/ros/filters + version: noetic-devel + ros/four_wheel_steering_msgs: + type: git + url: https://github.com/ros-drivers/four_wheel_steering_msgs + version: master + ros/geographic_info: + type: git + url: https://github.com/ros-geographic-info/geographic_info + version: master + # ros/geometry2: # in underlay_ws + # type: git + # url: https://github.com/lucasw/geometry2 + # version: noetic_aggregated + ros/grid_map: + type: git + url: https://github.com/lucasw/grid_map + version: tbb_2021 + ros/image_common: + type: git + url: https://github.com/lucasw/image_common + version: ubuntu_2210 + ros/image_pipeline: + type: git + url: https://github.com/lucasw/image_pipeline + version: rgb_in_depth_range + ros/image_transport_plugins: + type: git + url: https://github.com/lucasw/image_transport_plugins + version: enable_pub + ros/interactive_markers: + type: git + url: https://github.com/ros-visualization/interactive_markers + version: noetic-devel + ros/joint_state_publisher: + type: git + url: https://github.com/lucasw/joint_state_publisher + version: noetic_aggregated + ros/joystick_drivers: + type: git + url: https://github.com/lucasw/joystick_drivers + version: warn_not_error_if_no_joy + ros/laser_assembler: + type: git + url: https://github.com/lucasw/laser_assembler + version: noetic-devel + ros/libuvc_ros: + type: git + url: https://github.com/lucasw/libuvc_ros + version: libuvc_0_0_7 + ros/media_export: + type: git + url: https://github.com/ros/media_export + version: kinetic-devel + ros/navigation: + type: git + url: https://github.com/lucasw/navigation + version: lucasw_debug + ros/nmea_msgs: + type: git + url: https://github.com/ros-drivers/nmea_msgs + version: master + ros/nodelet_core: + type: git + url: https://github.com/lucasw/nodelet_core + version: throttle_looping_time + ros/octomap_msgs: + type: git + url: https://github.com/OctoMap/octomap_msgs + version: melodic-devel + ros/realtime_tools: + type: git + url: https://github.com/ros-controls/realtime_tools + version: noetic-devel + ros/robot_state_publisher: + type: git + url: https://github.com/lucasw/robot_state_publisher + version: robot_state_function + ros/ros_comm: # custom overlay with logging mods + type: git + url: https://github.com/lucasw/ros_comm + version: salsa_noetic_aggregated + ros/ros_control: + type: git + url: https://github.com/lucasw/ros_control + version: acceleration_limits + ros/ros_controllers: + type: git + url: https://github.com/lucasw/ros_controllers + version: avoid_no_trajectory_defined + ros/ros_tutorials: + type: git + url: https://github.com/lucasw/ros_tutorials + version: boost_placeholders + ros/rosconsole: # lucasw logging mods + type: git + url: https://github.com/lucasw/rosconsole + version: ubuntu_2210 + ros/roscpp_core: # lucasw fixes + type: git + url: https://github.com/lucasw/roscpp_core + version: duration_out_of_dual_range + ros/rospack: # debian patches + type: git + url: https://github.com/lucasw/rospack + version: salsa + ros/rqt: + type: git + url: https://github.com/lucasw/rqt + version: ubuntu_2210 + ros/rqt_bag: + type: git + url: https://github.com/lucasw/rqt_bag + version: build_2204 + ros/rqt_console: + type: git + url: https://github.com/ros-visualization/rqt_console + version: master + ros/rqt_graph: + type: git + url: https://github.com/ros-visualization/rqt_graph + version: master + ros/rqt_logger_level: + type: git + url: https://github.com/ros-visualization/rqt_logger_level + version: master + ros/rqt_plot: + type: git + url: https://github.com/ros-visualization/rqt_plot + version: master + ros/rqt_reconfigure: + type: git + url: https://github.com/ros-visualization/rqt_reconfigure + version: master + ros/rqt_robot_monitor: + type: git + url: https://github.com/ros-visualization/rqt_robot_monitor + version: ros1 + ros/rqt_robot_steering: + type: git + url: https://github.com/lucasw/rqt_robot_steering + version: python310 + ros/rqt_tf_tree: + type: git + url: https://github.com/ros-visualization/rqt_tf_tree + version: master + ros/rviz: + type: git + url: https://github.com/lucasw/rviz + version: misc_fixes + ros/teleop_twist_joy: + type: git + url: https://github.com/lucasw/teleop_twist_joy + version: cmp0115_cpp_extension + ros/teleop_twist_keyboard: + type: git + url: https://github.com/ros-teleop/teleop_twist_keyboard + version: master + ros/twist_mux: + type: git + url: https://github.com/lucasw/twist_mux + version: ubuntu2210 + ros/twist_mux_msgs: + type: git + url: https://github.com/ros-teleop/twist_mux_msgs + version: melodic-devel + ros/unique_identifier: + type: git + url: https://ros-geographic-info/unique_identifier + version: master + ros/urdf_geometry_parser: + type: git + url: https://ros-controls/urdf_geometry_parser + version: kinetic-devel + ros/urdf_parser_py: + type: git + url: https://github.com/ros/urdf_parser_py + version: melodic-devel + ros/usb_cam: + type: git + url: https://github.com/ros-drivers/usb_cam + version: develop + ros/video_stream_opencv: + type: git + url: https://github.com/lucasw/video_stream_opencv + version: build_2204 + ros/view_controller_msgs: + type: git + url: https://github.com/ros-visualization/view_controller_msgs + version: lunar-devel + ros/vision_msgs: + type: git + url: https://github.com/ros-perception/vision_msgs + version: noetic-devel + ros/web_video_server: + type: git + url: https://github.com/lucasw/web_video_server + version: boost_placeholders + ros/xacro: + type: git + url: https://github.com/lucasw/xacro + version: cleanup_roslint + roso/control_toolbox: + type: git + url: https://github.com/ros-o/control_toolbox + version: obese-devel + roso/qt_gui_core: + type: git + url: https://github.com/lucasw/qt_gui_core + version: ubuntu_2210 + roso/rosparam_shortcuts: + type: git + url: https://github.com/lucasw/rosparam_shortcuts + version: cleanup_lint + roso/rqt_image_view: + type: git + url: https://github.com/lucasw/rqt_image_view + version: detection2d_image_view From 6b9446f8dafbfe1c443de1986a16e9355e83347e Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Thu, 18 Jul 2024 06:50:04 -0700 Subject: [PATCH 46/76] removing rosfmt because build process was downloading a binary instead of building --- ubuntu_2204/base_repos.yaml | 4 ---- ubuntu_2404/extra_repos.yaml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/ubuntu_2204/base_repos.yaml b/ubuntu_2204/base_repos.yaml index 11c98fa..55357a1 100644 --- a/ubuntu_2204/base_repos.yaml +++ b/ubuntu_2204/base_repos.yaml @@ -355,10 +355,6 @@ repositories: type: git url: git@github.com:dheera/rosboard.git version: main - other/rosfmt: - type: git - url: git@github.com:lucasw/rosfmt - version: build_2204 other/rosmon: type: git url: git@github.com:lucasw/rosmon diff --git a/ubuntu_2404/extra_repos.yaml b/ubuntu_2404/extra_repos.yaml index 5c8469e..db636fe 100644 --- a/ubuntu_2404/extra_repos.yaml +++ b/ubuntu_2404/extra_repos.yaml @@ -360,10 +360,6 @@ repositories: type: git url: git@github.com:lucasw/rosboard.git version: patch-1 - other/rosfmt: - type: git - url: git@github.com:lucasw/rosfmt - version: build_2204 other/rosmon: type: git url: git@github.com:lucasw/rosmon From b5bc060659eeaaedba197365761e0a4dd06a3c9f Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Thu, 18 Jul 2024 07:02:08 -0700 Subject: [PATCH 47/76] also remove rosmon since rosfmt is removed --- ubuntu_2204/base_repos.yaml | 4 ---- ubuntu_2404/Dockerfile | 1 - ubuntu_2404/extra_repos.yaml | 4 ---- 3 files changed, 9 deletions(-) diff --git a/ubuntu_2204/base_repos.yaml b/ubuntu_2204/base_repos.yaml index 55357a1..6fe4773 100644 --- a/ubuntu_2204/base_repos.yaml +++ b/ubuntu_2204/base_repos.yaml @@ -355,10 +355,6 @@ repositories: type: git url: git@github.com:dheera/rosboard.git version: main - other/rosmon: - type: git - url: git@github.com:lucasw/rosmon - version: build_2204 other/rosshow: type: git url: git@github.com:dheera/rosshow diff --git a/ubuntu_2404/Dockerfile b/ubuntu_2404/Dockerfile index 01334df..ec22b50 100644 --- a/ubuntu_2404/Dockerfile +++ b/ubuntu_2404/Dockerfile @@ -168,7 +168,6 @@ RUN touch src/other/apriltag_ros/CATKIN_IGNORE RUN catkin build --no-status -j1 rtabmap* RUN catkin build --no-status -j1 fuse_viz RUN catkin build --no-status -j1 fuse* -RUN catkin build --no-status -j1 rosmon* RUN catkin build --no-status -j1 grid_map* RUN catkin build --no-status -j1 rviz* RUN catkin build --no-status -j1 octomap* diff --git a/ubuntu_2404/extra_repos.yaml b/ubuntu_2404/extra_repos.yaml index db636fe..d2211b7 100644 --- a/ubuntu_2404/extra_repos.yaml +++ b/ubuntu_2404/extra_repos.yaml @@ -360,10 +360,6 @@ repositories: type: git url: git@github.com:lucasw/rosboard.git version: patch-1 - other/rosmon: - type: git - url: git@github.com:lucasw/rosmon - version: build_2204 other/rosshow: type: git url: git@github.com:dheera/rosshow From 3e7cb0ff9975a9a3828e4119e648a32226cc54f2 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Thu, 18 Jul 2024 10:08:38 -0700 Subject: [PATCH 48/76] Install vcs in ubuntu_20_04.yml --- .github/workflows/ubuntu_20_04.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index 890b29e..042de80 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -17,6 +17,7 @@ jobs: - name: local apt dependencies run: | + apt install python3-vcstool mkdir staging cd staging sudo ../ros_from_src/dependencies.sh From 20bad0af4a703f53be1a196fd594900f7f04808a Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Thu, 18 Jul 2024 10:10:59 -0700 Subject: [PATCH 49/76] Update ubuntu_20_04.yml need sudo --- .github/workflows/ubuntu_20_04.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index 042de80..83d7abe 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -17,7 +17,7 @@ jobs: - name: local apt dependencies run: | - apt install python3-vcstool + sudo apt install python3-vcstool mkdir staging cd staging sudo ../ros_from_src/dependencies.sh From a42677e02b3028e8c467b2337e46ff4d44b4d397 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Thu, 18 Jul 2024 10:14:33 -0700 Subject: [PATCH 50/76] Pip install vcs ubuntu_20_04.yml --- .github/workflows/ubuntu_20_04.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index 83d7abe..ff98a7f 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -17,10 +17,10 @@ jobs: - name: local apt dependencies run: | - sudo apt install python3-vcstool mkdir staging cd staging sudo ../ros_from_src/dependencies.sh + pip install vcstool - name: local git dependencies run: | From 2c9870c39ac9ffa106fe617d4660b080cacc2f13 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Thu, 18 Jul 2024 10:23:14 -0700 Subject: [PATCH 51/76] Copy sh and yamls into staging ubuntu_20_04.yml --- .github/workflows/ubuntu_20_04.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index ff98a7f..35d5e7a 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -19,19 +19,21 @@ jobs: run: | mkdir staging cd staging - sudo ../ros_from_src/dependencies.sh + cp ../ros_from_src/*sh . + cp ../ros_from_src/*yaml . + sudo ./dependencies.sh pip install vcstool - name: local git dependencies run: | cd staging # override rosconsole in 20.04 for log4cxx compatibility - ROSCONSOLE=https://github.com/ros/rosconsole ../ros_from_src/git_clone.sh + ROSCONSOLE=https://github.com/ros/rosconsole git_clone.sh - name: local build run: | cd staging - ../ros_from_src/build.sh + ./build.sh - name: docker build from source 20.04 run: | From d301b09850c7b818e8bfa8929a4e3793f1dfd0e7 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Thu, 18 Jul 2024 10:29:18 -0700 Subject: [PATCH 52/76] Update ubuntu_20_04.yml run git clone properly --- .github/workflows/ubuntu_20_04.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index 35d5e7a..ed8199d 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -28,7 +28,7 @@ jobs: run: | cd staging # override rosconsole in 20.04 for log4cxx compatibility - ROSCONSOLE=https://github.com/ros/rosconsole git_clone.sh + ROSCONSOLE=https://github.com/ros/rosconsole ./git_clone.sh - name: local build run: | From 7b608ef11da95d9b7ebf97fd8e9f1fdd4121c2a8 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Thu, 18 Jul 2024 10:54:35 -0700 Subject: [PATCH 53/76] Update ubuntu_20_04.yml put yamls in right dir --- .github/workflows/ubuntu_20_04.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index ed8199d..6153e13 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -20,13 +20,14 @@ jobs: mkdir staging cd staging cp ../ros_from_src/*sh . - cp ../ros_from_src/*yaml . sudo ./dependencies.sh pip install vcstool - name: local git dependencies run: | cd staging + mkdir -p underlay_ws/src + cp ../ros_from_src/*yaml underlay_ws/src # override rosconsole in 20.04 for log4cxx compatibility ROSCONSOLE=https://github.com/ros/rosconsole ./git_clone.sh From 7359aaa732fb4d182ff433e6386ba4222b06c7df Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Thu, 18 Jul 2024 11:20:46 -0700 Subject: [PATCH 54/76] Put shell scripts in right location in ubuntu_20_04.yml --- .github/workflows/ubuntu_20_04.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index 6153e13..c428b8a 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -19,22 +19,22 @@ jobs: run: | mkdir staging cd staging - cp ../ros_from_src/*sh . - sudo ./dependencies.sh + mkdir -p underlay_ws/src + cp ../ros_from_src/*sh underlay_ws + sudo underlay_ws/dependencies.sh pip install vcstool - name: local git dependencies run: | cd staging - mkdir -p underlay_ws/src cp ../ros_from_src/*yaml underlay_ws/src # override rosconsole in 20.04 for log4cxx compatibility - ROSCONSOLE=https://github.com/ros/rosconsole ./git_clone.sh + ROSCONSOLE=https://github.com/ros/rosconsole underlay_ws/git_clone.sh - name: local build run: | cd staging - ./build.sh + underlay_ws/build.sh - name: docker build from source 20.04 run: | From 4f8ebf83c25fcf5bf4f99409933d588daa2a2a65 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 19 Jul 2024 09:00:54 -0700 Subject: [PATCH 55/76] Remove redundant python parts of build.sh --- build.sh | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/build.sh b/build.sh index e92a914..47bcccf 100755 --- a/build.sh +++ b/build.sh @@ -18,30 +18,11 @@ WS=`pwd`/underlay_ws/src echo $WS mkdir $WS -p -# python installs - -python --version | awk '{print $2}' | cut -d'.' -f1 -# TODO(lucasw) these aren't working -PYTHON_MAJOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f1` -PYTHON_MINOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f2` -# ubuntu 20.04? -OPT_PYTHONPATH0=$DEST/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/site-packages/ -mkdir -p $OPT_PYTHONPATH0 -echo $PYTHONPATH0 -# ubuntu 24.04 and 22.04? -OPT_PYTHONPATH1=$DEST/local/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/dist-packages/ -mkdir -p $OPT_PYTHONPATH1 -echo $PYTHONPATH1 - ROS_DEST=$DEST source $WS/../env.sh -# export PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH0:$OPT_PYTHONPATH1 - # catkin_pkg cd $WS/catkin_pkg python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed -ls -l $OPT_PYTHONPATH0 || ls -l $OPT_PYTHONPATH1 -ls -l $OPT_PYTHONPATH0/catkin_pkg* || ls -l $OPT_PYTHONPATH1/catkin_pkg* # python -c "import sys; print(sys.path)" python -c "import catkin_pkg; print(catkin_pkg.__version__)" python -c "from catkin_pkg.package import parse_package" From 2d145209e6146bb1bb01fbe291bf2fc47daa3f7b Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 19 Jul 2024 09:25:00 -0700 Subject: [PATCH 56/76] make a /home/lucasw/other/install/local/bin in case an install doesn't make it --- build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sh b/build.sh index 47bcccf..e4b5806 100755 --- a/build.sh +++ b/build.sh @@ -18,6 +18,8 @@ WS=`pwd`/underlay_ws/src echo $WS mkdir $WS -p +mkdir -p $DEST/local/bin + ROS_DEST=$DEST source $WS/../env.sh # catkin_pkg From 6b5e04397fb15dda3a7145e7239dfa563ef269d1 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 19 Jul 2024 09:30:38 -0700 Subject: [PATCH 57/76] do a local build in 24.04 as well as 20.04 --- .github/workflows/ubuntu_20_04.yml | 5 +++++ .github/workflows/ubuntu_24_04.yaml | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index c428b8a..7010f01 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -36,6 +36,11 @@ jobs: cd staging underlay_ws/build.sh + - name: local catkin build + run: | + cd staging + underlay_ws/catkin.sh + - name: docker build from source 20.04 run: | cd ros_from_src diff --git a/.github/workflows/ubuntu_24_04.yaml b/.github/workflows/ubuntu_24_04.yaml index 312a256..8f602fe 100644 --- a/.github/workflows/ubuntu_24_04.yaml +++ b/.github/workflows/ubuntu_24_04.yaml @@ -15,6 +15,32 @@ jobs: path: ros_from_src submodules: recursive + - name: local apt dependencies + run: | + mkdir staging + cd staging + mkdir -p underlay_ws/src + cp ../ros_from_src/*sh underlay_ws + sudo underlay_ws/dependencies.sh + pip install vcstool + + - name: local git dependencies + run: | + cd staging + cp ../ros_from_src/*yaml underlay_ws/src + # override rosconsole in 20.04 for log4cxx compatibility + ROSCONSOLE=https://github.com/ros/rosconsole underlay_ws/git_clone.sh + + - name: local build + run: | + cd staging + underlay_ws/build.sh + + - name: local catkin build + run: | + cd staging + underlay_ws/catkin.sh + - name: docker build from source 24.04 run: | cd ros_from_src From 27e706bff748d512566d140c1dcc9d1b1ae9251e Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 19 Jul 2024 09:42:20 -0700 Subject: [PATCH 58/76] pip install vcstool only in 20.04 --- .github/workflows/ubuntu_20_04.yml | 5 ++++- .github/workflows/ubuntu_24_04.yaml | 1 - dependencies.sh | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index 7010f01..e99e5c3 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -17,12 +17,15 @@ jobs: - name: local apt dependencies run: | + + apt-get install -y python3-pip + pip install vcstool + mkdir staging cd staging mkdir -p underlay_ws/src cp ../ros_from_src/*sh underlay_ws sudo underlay_ws/dependencies.sh - pip install vcstool - name: local git dependencies run: | diff --git a/.github/workflows/ubuntu_24_04.yaml b/.github/workflows/ubuntu_24_04.yaml index 8f602fe..41befe2 100644 --- a/.github/workflows/ubuntu_24_04.yaml +++ b/.github/workflows/ubuntu_24_04.yaml @@ -22,7 +22,6 @@ jobs: mkdir -p underlay_ws/src cp ../ros_from_src/*sh underlay_ws sudo underlay_ws/dependencies.sh - pip install vcstool - name: local git dependencies run: | diff --git a/dependencies.sh b/dependencies.sh index 1e41556..42a7191 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -47,6 +47,6 @@ apt-get install -y python3-gnupg # TODO(lucasw) get this from source later # apt-get install -y python3-rosunit -apt-get install -y catkin-tools +apt-get install -y catkin-tools || true # not available in 20.04 apt-get install -y libbullet-dev apt-get install -y vcstool || true # this is in 24.04 but not 20.04 From c8a2b97d49406c309cb24d8a5af666cacd735334 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 19 Jul 2024 09:43:31 -0700 Subject: [PATCH 59/76] sudo apt install in action --- .github/workflows/ubuntu_20_04.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index e99e5c3..8c870e3 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -17,8 +17,7 @@ jobs: - name: local apt dependencies run: | - - apt-get install -y python3-pip + sudo apt-get install -y python3-pip pip install vcstool mkdir staging From 0935555d8a829787069041b98bd6dd37a01c1f3b Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 19 Jul 2024 10:43:00 -0700 Subject: [PATCH 60/76] splitting out some 22.04 docker builds, adding SUBDIR so additional workspace will be built in 20.04 and 24.04 --- .github/workflows/ubuntu_20_04.yml | 15 +- .github/workflows/ubuntu_22_04_docker.yml | 27 ++ .github/workflows/ubuntu_24_04.yaml | 2 +- Dockerfile | 9 +- build.sh | 9 +- dependencies.sh | 5 +- env.sh | 4 +- ubuntu_2004/base_catkin.sh | 25 ++ ubuntu_2004/base_git_clone.sh | 17 + ubuntu_2004/base_repos.yaml | 418 ++++++++++++++++++++++ ubuntu_2004/dependencies.sh | 3 + 11 files changed, 509 insertions(+), 25 deletions(-) create mode 100644 .github/workflows/ubuntu_22_04_docker.yml create mode 100755 ubuntu_2004/base_catkin.sh create mode 100755 ubuntu_2004/base_git_clone.sh create mode 100644 ubuntu_2004/base_repos.yaml create mode 100755 ubuntu_2004/dependencies.sh diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index 8c870e3..060bfe1 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -17,9 +17,6 @@ jobs: - name: local apt dependencies run: | - sudo apt-get install -y python3-pip - pip install vcstool - mkdir staging cd staging mkdir -p underlay_ws/src @@ -46,14 +43,4 @@ jobs: - name: docker build from source 20.04 run: | cd ros_from_src - docker build --build-arg IMAGE=ubuntu:20.04 --build-arg ROSCONSOLE=https://github.com/ros/rosconsole --build-arg PYTHON_MINOR_VERSION=8 . -t ros2004 - - - name: docker build from source 22.04 - run: | - cd ros_from_src - docker build --build-arg IMAGE=ubuntu:22.04 --build-arg PYTHON_MINOR_VERSION=10 . -t ros2204 - - - name: docker build from source and debian 22.04 - run: | - cd ros_from_src/ubuntu_2204 - docker build . -t ros_debian_2204 + docker build --build-arg IMAGE=ubuntu:20.04 --build-arg SUBDIR=ubuntu_2004 . -t ros2004 diff --git a/.github/workflows/ubuntu_22_04_docker.yml b/.github/workflows/ubuntu_22_04_docker.yml new file mode 100644 index 0000000..176608d --- /dev/null +++ b/.github/workflows/ubuntu_22_04_docker.yml @@ -0,0 +1,27 @@ +name: Ubuntu 22.04 Noetic ROS build from source in docker + +on: + push: + workflow_dispatch: + +jobs: + ubuntu2204docker: + runs-on: ubuntu-22.04 + # env: + steps: + - name: git clone git@github.com:lucasw/ros_from_src + uses: actions/checkout@v2 + with: + path: ros_from_src + submodules: recursive + + # TODO(lucasw) move these 22.04 builds into separate action + - name: docker build from source 22.04 + run: | + cd ros_from_src + docker build --build-arg IMAGE=ubuntu:22.04 --build-arg PYTHON_MINOR_VERSION=10 . -t ros2204 + + - name: docker build from source and debian 22.04 + run: | + cd ros_from_src/ubuntu_2204 + docker build . -t ros_debian_2204 diff --git a/.github/workflows/ubuntu_24_04.yaml b/.github/workflows/ubuntu_24_04.yaml index 41befe2..f30fd98 100644 --- a/.github/workflows/ubuntu_24_04.yaml +++ b/.github/workflows/ubuntu_24_04.yaml @@ -43,7 +43,7 @@ jobs: - name: docker build from source 24.04 run: | cd ros_from_src - docker build --build-arg IMAGE=ubuntu:24.04 . -t ros2404 + docker build --build-arg IMAGE=ubuntu:24.04 --build-arg SUBDIR=ubuntu_2404 . -t ros2404 # TODO(lucasw) ubuntu_2404/Dockerfile doesn't work, was depending on the now-removed # apt debian science ros packages diff --git a/Dockerfile b/Dockerfile index 90fdee7..599bb86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ ARG IMAGE=ubuntu:24.04 FROM ${IMAGE} ARG IMAGE RUN echo ${IMAGE} +ARG SUBDIR ENV DEBIAN_FRONTEND="noninteractive" @@ -41,15 +42,15 @@ RUN $SRC/ros_from_src/catkin.sh # WORKDIR $SRC/ros_from_src RUN mkdir -p base_ws/src -COPY ubuntu_2404/base_repos.yaml base_ws/src -COPY ubuntu_2404/base_git_clone.sh $SRC/ros_from_src +COPY ${SUBDIR}/base_repos.yaml base_ws/src +COPY ${SUBDIR}/base_git_clone.sh $SRC/ros_from_src # RUN ROS_CONSOLE=$ROSCONSOLE $SRC/ros_from_src/git_clone.sh RUN $SRC/ros_from_src/base_git_clone.sh -COPY ubuntu_2404/dependencies.sh $SRC/ros_from_src/base_dependencies.sh +COPY ${SUBDIR}/dependencies.sh $SRC/ros_from_src/base_dependencies.sh RUN $SRC/ros_from_src/base_dependencies.sh -COPY ubuntu_2404/base_catkin.sh $SRC/ros_from_src +COPY ${SUBDIR}/base_catkin.sh $SRC/ros_from_src RUN $SRC/ros_from_src/base_catkin.sh WORKDIR $WS/.. diff --git a/build.sh b/build.sh index e4b5806..cc8fdb4 100755 --- a/build.sh +++ b/build.sh @@ -42,12 +42,13 @@ python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-v mkdir -p $BUILD/catkin cd $BUILD/catkin cmake $WS/catkin -DCATKIN_BUILD_BINARY_PACKAGE=ON -DCMAKE_INSTALL_PREFIX=$DEST -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF -DCATKIN_INSTALL_INTO_PREFIX_ROOT=true && make && make install +echo $PATH ls -l $DEST/local/bin -PATH=$PATH:$DEST/bin -PATH=$PATH:$DEST/local/bin +ls -l $DEST/bin which catkin -catkin --version echo $PYTHONPATH +# ls -l $DEST/local/lib/python3.8/dist-packages/ || ls -l $DEST/lib/python3.8/site-packages/ +catkin --version python -c "import catkin; print(catkin)" # console_bridge @@ -132,6 +133,8 @@ python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-v cd $WS/rosdep python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed +echo $PATH +which rosdep rosdep init || true rosdep update diff --git a/dependencies.sh b/dependencies.sh index 42a7191..56630f9 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -2,6 +2,10 @@ # build apt installs apt-get update + +apt-get install -y python3-pip +apt-get install -y vcstool || pip install vcstool # vcs is in apt 24.04 but only pip in 20.04 + apt-get install -y build-essential apt-get install -y bzip2 libbz2-dev apt-get install -y cmake @@ -49,4 +53,3 @@ apt-get install -y python3-gnupg apt-get install -y catkin-tools || true # not available in 20.04 apt-get install -y libbullet-dev -apt-get install -y vcstool || true # this is in 24.04 but not 20.04 diff --git a/env.sh b/env.sh index 88fe78e..ee45ac8 100755 --- a/env.sh +++ b/env.sh @@ -1,14 +1,14 @@ #!/usr/bin/bash # ROS_DEST=`pwd`/ros source ros_from_src/env.sh # export ROS_DEST=`pwd`/ros -export PATH=$PATH:$ROS_DEST/bin +export PATH=$PATH:$ROS_DEST/bin:$ROS_DEST/local/bin export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROS_DEST/lib # export PATH=$PATH:$ROS_DEST/local/bin # python --version | awk '{print $2}' | cut -d'.' -f1 PYTHON_MAJOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f1` PYTHON_MINOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f2` -OPT_PYTHONPATH0=$ROS_DEST/local/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/site-packages/ +OPT_PYTHONPATH0=$ROS_DEST/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/site-packages/ OPT_PYTHONPATH1=$ROS_DEST/local/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/dist-packages/ export PYTHONPATH=$PYTHONPATH:$OPT_PYTHONPATH0:$OPT_PYTHONPATH1 diff --git a/ubuntu_2004/base_catkin.sh b/ubuntu_2004/base_catkin.sh new file mode 100755 index 0000000..4d3256a --- /dev/null +++ b/ubuntu_2004/base_catkin.sh @@ -0,0 +1,25 @@ +#!/bin/bash +set -e +set -x + +ls -l +ls -l ros/bin +ROS_DEST=`pwd`/ros source underlay_ws/env.sh + +WS=`pwd`/base_ws/src +echo $WS + +cd $WS/.. +echo "#####################" +pwd +source ../underlay_ws/install/setup.bash +catkin init +catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -DCATKIN_ENABLE_TESTING=False +echo $PATH +echo $LD_LIBRARY_PATH +rospack list + +catkin build ros_comm +source install/setup.bash +rospack list +# TODO(lucasw) run tests diff --git a/ubuntu_2004/base_git_clone.sh b/ubuntu_2004/base_git_clone.sh new file mode 100755 index 0000000..4daac20 --- /dev/null +++ b/ubuntu_2004/base_git_clone.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# TODO(lucasw) replace the below with submodules +# export PATH=$PATH:/usr/local/bin +set -e +set -x + +WS=`pwd`/base_ws/src +echo $WS +mkdir $WS -p + +# TODO(lucasw) replace these git clones with vcs +# packages that need to be cmake installed, and are ros packages in a catkin workspace +cd $WS +vcs import --input base_repos.yaml --retry 10 + +# ROSCONSOLE1=${ROSCONSOLE:-https://github.com/ros-o/rosconsole} +# git clone $ROSCONSOLE1 diff --git a/ubuntu_2004/base_repos.yaml b/ubuntu_2004/base_repos.yaml new file mode 100644 index 0000000..a3a3c9a --- /dev/null +++ b/ubuntu_2004/base_repos.yaml @@ -0,0 +1,418 @@ +repositories: + # extra/common_msgs: # in underlay_ws + # type: git + # url: https://github.com/ros/common_msgs + # version: noetic-devel + # extra/geometry: + # type: git + # url: https://github.com/ros-o/geometry + # version: obese-devel + extra/laser_geometry: + type: git + url: https://github.com/ros-o/laser_geometry + version: obese-devel + extra/navigation_msgs: + type: git + url: https://github.com/ros-planning/navigation_msgs + version: ros1 + extra/pcl_msgs: + type: git + url: https://github.com/ros-perception/pcl_msgs + version: noetic-devel + extra/perception_pcl: + type: git + url: https://github.com/ros-o/perception_pcl + version: obese-devel + extra/python_qt_binding: + type: git + url: https://github.com/ros-o/python_qt_binding + version: obese-devel + extra/vision_opencv: + type: git + url: https://github.com/ros-perception/vision_opencv + version: noetic + lucasw/dynamic_reconfigure_tools: + type: git + url: https://github.com/lucasw/dynamic_reconfigure_tools + version: master + lucasw/image_manip: + type: git + url: https://github.com/lucasw/image_manip + version: fix_zero_frame_rate + lucasw/nodelet_demo: + type: git + url: https://github.com/lucasw/nodelet_demo + version: master + lucasw/ros1_lifecycle: + type: git + url: https://github.com/lucasw/ros1_lifecycle + version: misc_fixes + lucasw/ros_example: + type: git + url: https://github.com/lucasw/ros_example + version: main + lucasw/ros_system_monitor: + type: git + url: https://github.com/lucasw/ros_system_monitor + version: chrony_monitor + lucasw/screengrab_ros: + type: git + url: https://github.com/lucasw/screengrab_ros + version: master + lucasw/signal_generator: + type: git + url: https://github.com/lucasw/signal_generator + version: master + lucasw/tf_demo: + type: git + url: https://github.com/lucasw/tf_demo + version: old_tf_to_new_tf + lucasw/timer_test: + type: git + url: https://github.com/lucasw/timer_test + version: master + lucasw/topic_state: + type: git + url: https://github.com/lucasw/topic_state + version: master + lucasw/transform_point_cloud: + type: git + url: https://github.com/lucasw/transform_point_cloud + version: master + lucasw/v4l2ucp: + type: git + url: https://github.com/lucasw/v4l2ucp + version: master + lucasw/vimjay: + type: git + url: https://github.com/lucasw/vimjay + version: eliminate_build_warnings + opencv_apps: + type: git + # url: https://github.com/ros-perception/opencv_apps + url: https://github.com/muellerbernd/opencv_apps + version: indigo + other/PlotJuggler: + type: git + url: https://github.com/facontidavide/PlotJuggler + version: main + other/apriltag_ros: + type: git + url: https://github.com/AprilRobotics/apriltag_ros + version: master + other/camera_throttler_nodelets: + type: git + url: https://github.com/lucasw/camera_throttler_nodelets + version: noetic_aggregated + other/catkin_virtualenv: + type: git + url: https://github.com/locusrobotics/catkin_virtualenv + version: master + other/ddynamic_reconfigure: + type: git + url: https://github.com/ros-o/ddynamic_reconfigure + version: obese-devel + other/euslisp-release: + type: git + url: https://github.com/tork-a/euslisp-release + version: release/melodic/euslisp + other/fiducials: + type: git + url: https://github.com/lucasw/fiducials + version: cmake_vision_msgs + # other/geneus: # in underlay_ws + # type: git + # url: https://github.com/jsk-ros-pkg/geneus + # version: master + other/jsk_common: + type: git + url: https://github.com/lucasw/jsk_common + version: video_to_bag_features + other/jsk_common_msgs: + type: git + url: https://github.com/lucasw/jsk_common_msgs + version: master + other/jsk_recognition: + type: git + url: https://github.com/lucasw/jsk_recognition + version: pcl_vtk_isfinite + other/jsk_roseus: + type: git + url: https://github.com/jsk-ros-pkg/jsk_roseus + version: master + other/libnabo: + type: git + url: https://github.com/ethz-asl/libnabo + version: master + other/lvr2: + type: git + url: https://github.com/uos/lvr2 + version: humble + other/marti_messages: + type: git + url: https://github.com/swri-robotics/marti_messages + version: master + other/message_filters: + type: git + url: https://github.com/fkie/message_filters + version: master + other/nmea_navsat_driver: + type: git + url: https://github.com/ros-drivers/nmea_navsat_driver + version: master + other/nodelet_rosbag: + type: git + url: https://github.com/lucasw/nodelet_rosbag + version: pluginlib_hpp + other/pal_statistics: + type: git + url: https://github.com/pal-robotics/pal_statistics + version: kinetic-devel + other/pid: + type: git + url: https://github.com/lucasw/pid + version: boost_placeholders + other/plotjuggler-ros-plugins: + type: git + url: https://github.com/PlotJuggler/plotjuggler-ros-plugins + version: main + other/plotjuggler_msgs: + type: git + url: https://github.com/PlotJuggler/plotjuggler_msgs + version: main + other/point_cloud_converter: + type: git + url: https://github.com/pal-robotics-forks/point_cloud_converter + version: hydro-devel + other/ros_control_boilerplate: + type: git + url: https://github.com/lucasw/ros_control_boilerplate + version: cpp17 + other/ros_numpy: + type: git + url: https://github.com/lucasw/ros_numpy + version: collections_abc + other/ros_rtsp: + type: git + url: https://github.com/lucasw/ros_rtsp + version: pluginlib_hpp + other/ros_type_introspection: + type: git + url: https://github.com/lucasw/ros_type_introspection + version: build_2204 + other/rosbag_snapshot: + type: git + url: https://github.com/ros/rosbag_snapshot + version: main + other/static_transform_mux: + type: git + url: https://github.com/tradr-project/static_transform_mux + version: master + other/tf2_2d: + type: git + url: https://github.com/locusrobotics/tf2_2d + version: devel + other/wu_ros_tools: + type: git + url: https://github.com/lucasw/wu_ros_tools + version: noetic + ros/audio_common: + type: git + url: https://github.com/ros-drivers/audio_common + version: master + ros/camera_info_manager_py: + type: git + url: https://github.com/lucasw/camera_info_manager_py + version: noetic-devel + ros/common_tutorials: + type: git + url: https://github.com/lucasw/common_tutorials + version: boost_placeholders + ros/control_msgs: + type: git + url: https://github.com/ros-controls/control_msgs + version: kinetic-devel + ros/ddynamic_reconfigure_python: + type: git + url: https://github.com/pal-robotics/ddynamic_reconfigure_python + version: master + ros/diagnostics: + type: git + url: https://github.com/ros/diagnostics + version: noetic-devel + ros/dynamic_reconfigure: + type: git + url: https://github.com/lucasw/dynamic_reconfigure + version: init_default_values + ros/filters: + type: git + url: https://github.com/ros/filters + version: noetic-devel + ros/four_wheel_steering_msgs: + type: git + url: https://github.com/ros-drivers/four_wheel_steering_msgs + version: master + ros/geographic_info: + type: git + url: https://github.com/ros-geographic-info/geographic_info + version: master + # ros/geometry2: # in underlay_ws + # type: git + # url: https://github.com/lucasw/geometry2 + # version: noetic_aggregated + ros/grid_map: + type: git + url: https://github.com/lucasw/grid_map + version: tbb_2021 + ros/image_common: + type: git + url: https://github.com/lucasw/image_common + version: ubuntu_2210 + ros/image_pipeline: + type: git + url: https://github.com/lucasw/image_pipeline + version: rgb_in_depth_range + ros/image_transport_plugins: + type: git + url: https://github.com/lucasw/image_transport_plugins + version: enable_pub + ros/joint_state_publisher: + type: git + url: https://github.com/lucasw/joint_state_publisher + version: noetic_aggregated + ros/joystick_drivers: + type: git + url: https://github.com/lucasw/joystick_drivers + version: warn_not_error_if_no_joy + ros/laser_assembler: + type: git + url: https://github.com/lucasw/laser_assembler + version: noetic-devel + ros/libuvc_ros: + type: git + url: https://github.com/lucasw/libuvc_ros + version: libuvc_0_0_7 + ros/media_export: + type: git + url: https://github.com/ros/media_export + version: kinetic-devel + ros/navigation: + type: git + url: https://github.com/lucasw/navigation + version: lucasw_debug + ros/nmea_msgs: + type: git + url: https://github.com/ros-drivers/nmea_msgs + version: master + ros/nodelet_core: + type: git + url: https://github.com/lucasw/nodelet_core + version: throttle_looping_time + ros/octomap_msgs: + type: git + url: https://github.com/OctoMap/octomap_msgs + version: melodic-devel + ros/realtime_tools: + type: git + url: https://github.com/ros-controls/realtime_tools + version: noetic-devel + ros/robot_state_publisher: + type: git + url: https://github.com/lucasw/robot_state_publisher + version: robot_state_function + ros/ros_comm: # custom overlay with logging mods + type: git + url: https://github.com/lucasw/ros_comm + version: salsa_noetic_aggregated + ros/ros_control: + type: git + url: https://github.com/lucasw/ros_control + version: acceleration_limits + ros/ros_controllers: + type: git + url: https://github.com/lucasw/ros_controllers + version: avoid_no_trajectory_defined + ros/ros_tutorials: + type: git + url: https://github.com/lucasw/ros_tutorials + version: boost_placeholders + ros/rosconsole: # lucasw logging mods + type: git + url: https://github.com/lucasw/rosconsole + version: ubuntu_2210 + ros/roscpp_core: # lucasw fixes + type: git + url: https://github.com/lucasw/roscpp_core + version: duration_out_of_dual_range + ros/rospack: # debian patches + type: git + url: https://github.com/lucasw/rospack + version: salsa + ros/rqt: + type: git + url: https://github.com/lucasw/rqt + version: ubuntu_2210 + ros/teleop_twist_joy: + type: git + url: https://github.com/lucasw/teleop_twist_joy + version: cmp0115_cpp_extension + ros/teleop_twist_keyboard: + type: git + url: https://github.com/ros-teleop/teleop_twist_keyboard + version: master + ros/twist_mux: + type: git + url: https://github.com/lucasw/twist_mux + version: ubuntu2210 + ros/twist_mux_msgs: + type: git + url: https://github.com/ros-teleop/twist_mux_msgs + version: melodic-devel + ros/unique_identifier: + type: git + url: https://github.com/ros-geographic-info/unique_identifier + version: master + ros/urdf_geometry_parser: + type: git + url: https://github.com/ros-controls/urdf_geometry_parser + version: kinetic-devel + ros/urdf_parser_py: + type: git + url: https://github.com/ros/urdf_parser_py + version: melodic-devel + ros/usb_cam: + type: git + url: https://github.com/ros-drivers/usb_cam + version: develop + ros/video_stream_opencv: + type: git + url: https://github.com/lucasw/video_stream_opencv + version: build_2204 + ros/view_controller_msgs: + type: git + url: https://github.com/ros-visualization/view_controller_msgs + version: lunar-devel + ros/vision_msgs: + type: git + url: https://github.com/ros-perception/vision_msgs + version: noetic-devel + ros/web_video_server: + type: git + url: https://github.com/lucasw/web_video_server + version: boost_placeholders + ros/xacro: + type: git + url: https://github.com/lucasw/xacro + version: cleanup_roslint + roso/control_toolbox: + type: git + url: https://github.com/ros-o/control_toolbox + version: obese-devel + roso/qt_gui_core: + type: git + url: https://github.com/lucasw/qt_gui_core + version: ubuntu_2210 + roso/rosparam_shortcuts: + type: git + url: https://github.com/lucasw/rosparam_shortcuts + version: cleanup_lint diff --git a/ubuntu_2004/dependencies.sh b/ubuntu_2004/dependencies.sh new file mode 100755 index 0000000..f85cd4a --- /dev/null +++ b/ubuntu_2004/dependencies.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +apt-get install -yq libb64-dev libboost-iostreams-dev libboost-test-dev libboost-timer-dev libcgal-dev libgdal-dev libopencv-dev liboctomap-dev libpcl-dev libvtk7-dev sip-dev From c9f5d79623fc84e7faf5a2df35d38f520dbf0a2d Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 19 Jul 2024 10:48:31 -0700 Subject: [PATCH 61/76] use 24.04 dependencies and repos in 22.04 build --- .github/workflows/ubuntu_22_04_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_22_04_docker.yml b/.github/workflows/ubuntu_22_04_docker.yml index 176608d..b05e447 100644 --- a/.github/workflows/ubuntu_22_04_docker.yml +++ b/.github/workflows/ubuntu_22_04_docker.yml @@ -19,7 +19,7 @@ jobs: - name: docker build from source 22.04 run: | cd ros_from_src - docker build --build-arg IMAGE=ubuntu:22.04 --build-arg PYTHON_MINOR_VERSION=10 . -t ros2204 + docker build --build-arg IMAGE=ubuntu:22.04 --build-arg SUBDIR=ubuntu_2404 . -t ros2204 - name: docker build from source and debian 22.04 run: | From aea6663f80586f328ca37eb4f646a4c945fc15fb Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sat, 20 Jul 2024 10:33:57 -0700 Subject: [PATCH 62/76] use ros-o repos for urdf and kdl_parser so building in 22.04 works --- Dockerfile | 6 +++--- catkin.sh | 5 ++++- dependencies.sh | 1 + ubuntu_2004/dependencies.sh | 2 +- ubuntu_2404/dependencies.sh | 2 +- underlay_repos.yaml | 17 +++++++++++------ 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 599bb86..04eac7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,9 @@ WORKDIR / COPY dependencies.sh $SRC/ros_from_src RUN $SRC/ros_from_src/dependencies.sh +COPY ${SUBDIR}/dependencies.sh $SRC/ros_from_src/base_dependencies.sh +RUN $SRC/ros_from_src/base_dependencies.sh + # WORKDIR $SRC/ros_from_src RUN mkdir -p underlay_ws/src COPY underlay_repos.yaml underlay_ws/src @@ -47,9 +50,6 @@ COPY ${SUBDIR}/base_git_clone.sh $SRC/ros_from_src # RUN ROS_CONSOLE=$ROSCONSOLE $SRC/ros_from_src/git_clone.sh RUN $SRC/ros_from_src/base_git_clone.sh -COPY ${SUBDIR}/dependencies.sh $SRC/ros_from_src/base_dependencies.sh -RUN $SRC/ros_from_src/base_dependencies.sh - COPY ${SUBDIR}/base_catkin.sh $SRC/ros_from_src RUN $SRC/ros_from_src/base_catkin.sh diff --git a/catkin.sh b/catkin.sh index bbba7af..1203538 100755 --- a/catkin.sh +++ b/catkin.sh @@ -12,13 +12,16 @@ echo $WS cd $WS/.. echo "#####################" pwd +# TODO(lucasw) would need to run unminimize to restore man pages +man g++ # grep "This is the default for C++ code" catkin init catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -DCATKIN_ENABLE_TESTING=False echo $PATH echo $LD_LIBRARY_PATH rospack list -catkin build +catkin build --no-status urdf +catkin build --no-status source install/setup.bash rospack list # TODO(lucasw) run tests diff --git a/dependencies.sh b/dependencies.sh index 56630f9..bd476be 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -11,6 +11,7 @@ apt-get install -y bzip2 libbz2-dev apt-get install -y cmake apt-get install -y coreutils apt-get install -y git +apt-get install -y libb64-dev apt-get install -y libboost-dev apt-get install -y libboost-filesystem-dev apt-get install -y libboost-program-options-dev diff --git a/ubuntu_2004/dependencies.sh b/ubuntu_2004/dependencies.sh index f85cd4a..af7ee78 100755 --- a/ubuntu_2004/dependencies.sh +++ b/ubuntu_2004/dependencies.sh @@ -1,3 +1,3 @@ #!/bin/bash -apt-get install -yq libb64-dev libboost-iostreams-dev libboost-test-dev libboost-timer-dev libcgal-dev libgdal-dev libopencv-dev liboctomap-dev libpcl-dev libvtk7-dev sip-dev +apt-get install -yq libboost-iostreams-dev libboost-test-dev libboost-timer-dev libcgal-dev libgdal-dev libopencv-dev liboctomap-dev libpcl-dev libvtk7-dev sip-dev diff --git a/ubuntu_2404/dependencies.sh b/ubuntu_2404/dependencies.sh index 11eb683..2da1bd2 100755 --- a/ubuntu_2404/dependencies.sh +++ b/ubuntu_2404/dependencies.sh @@ -1,3 +1,3 @@ #!/bin/bash -apt-get install -yq libb64-dev libboost-iostreams-dev libboost-test-dev libboost-timer-dev libcgal-dev libgdal-dev libopencv-dev liboctomap-dev libpcl-dev libvtk9-dev sip-dev +apt-get install -yq libboost-iostreams-dev libboost-test-dev libboost-timer-dev libcgal-dev libgdal-dev libopencv-dev liboctomap-dev libpcl-dev libvtk9-dev sip-dev diff --git a/underlay_repos.yaml b/underlay_repos.yaml index c54586b..14a78eb 100644 --- a/underlay_repos.yaml +++ b/underlay_repos.yaml @@ -73,8 +73,8 @@ repositories: version: obese-devel kdl_parser: type: git - url: https://github.com/ros/kdl_parser.git - version: noetic-devel + url: https://github.com/ros-o/kdl_parser + version: obese-devel message_generation: type: git url: https://github.com/ros/message_generation @@ -100,8 +100,11 @@ repositories: version: noetic-devel ros_comm: type: git - url: https://github.com/ros-o/ros_comm - version: obese-devel + # TODO(lucasw) got std::shared_mutex log4cxx errors in Ubuntu 22.04 with this version + # url: https://github.com/ros-o/ros_comm + # version: obese-devel + url: https://github.com/lucasw/ros_comm + version: salsa_noetic_aggregated ros_comm_msgs: type: git url: https://github.com/ros/ros_comm_msgs @@ -145,5 +148,7 @@ repositories: version: kinetic-devel urdf: type: git - url: https://github.com/ros/urdf.git - version: melodic-devel + url: https://github.com/ros-o/urdf + version: obese-devel + # url: https://github.com/lucasw/urdf + # version: cmake_cxx_17 From 03a53a54decac06dc5d8e6710f2233bec4759626 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 20 Aug 2024 11:36:43 -0700 Subject: [PATCH 63/76] remove wu_ros_tools from base_repos.yaml, still using it in rqt rviz repos --- ubuntu_2404/base_repos.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index a3a3c9a..cd241e0 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -212,10 +212,6 @@ repositories: type: git url: https://github.com/locusrobotics/tf2_2d version: devel - other/wu_ros_tools: - type: git - url: https://github.com/lucasw/wu_ros_tools - version: noetic ros/audio_common: type: git url: https://github.com/ros-drivers/audio_common From da5613056d46dcbe1240e7e45d1a8ac1f71f36d9 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 20 Aug 2024 11:59:04 -0700 Subject: [PATCH 64/76] add all the 24.04 dependencies to the script, and install them in the 24.04 github action (though it doesn't use them yet, it isn't doing a base_repos + rqt rviz repos build) --- .github/workflows/ubuntu_24_04.yaml | 1 + ubuntu_2404/dependencies.sh | 51 ++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_24_04.yaml b/.github/workflows/ubuntu_24_04.yaml index f30fd98..b965104 100644 --- a/.github/workflows/ubuntu_24_04.yaml +++ b/.github/workflows/ubuntu_24_04.yaml @@ -22,6 +22,7 @@ jobs: mkdir -p underlay_ws/src cp ../ros_from_src/*sh underlay_ws sudo underlay_ws/dependencies.sh + sudo ../ros_from_src/ubuntu_2404/dependencies.sh - name: local git dependencies run: | diff --git a/ubuntu_2404/dependencies.sh b/ubuntu_2404/dependencies.sh index 2da1bd2..addfdb9 100755 --- a/ubuntu_2404/dependencies.sh +++ b/ubuntu_2404/dependencies.sh @@ -1,3 +1,52 @@ #!/bin/bash -apt-get install -yq libboost-iostreams-dev libboost-test-dev libboost-timer-dev libcgal-dev libgdal-dev libopencv-dev liboctomap-dev libpcl-dev libvtk9-dev sip-dev +apt-get install -yqq git +apt-get install -yqq catkin-tools vcstool +apt-get install -yqq libgsl-dev wget freeglut3-dev libcgal-dev libhdf5-dev libturbojpeg0-dev libzmq3-dev +apt-get -y install ocl-icd-opencl-dev opencl-headers +apt-get install -yqq cython3 libapriltag-dev libceres-dev libfmt-dev libfrei0r-ocaml-dev libgmock-dev libgoogle-glog-dev +apt-get install -yqq libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev # liborocos-bfl-dev +apt-get install -yqq curl jq +apt-get install -yqq libyaml-cpp-dev +apt-get install -yqq python-is-python3 python3-venv +apt-get install -yqq libsdl-image1.2-dev libspnav-dev libuvc-dev libv4l-dev +apt-get install -yqq libopenvdb-dev +apt-get install -yqq catkin-lint +apt-get install -yqq liburdfdom-dev +apt-get install -yqq libimage-view-dev +apt-get install -yqq libgeographiclib-dev + +# install every ros package +# apt-get install -yqq ros-core +# apt-get install -yqq ros-core-dev +# apt-get install -yqq ros-desktop-full +# apt-get install -yqq `apt-cache search "Robot OS" | awk '{print $1}' | xargs | sed 's/\n/ /g'` +# apt-get install -yqq python3-tf2-geometry-msgs +# apt-get install -yqq libpcl-ros-dev + +apt-get install -yqq libtf-conversions-dev + +apt-get install -yqq build-essential + +apt-get install -yqq libboost-iostreams-dev +apt-get install -yqq libjemalloc-dev + +# from rosdep +apt-get install -yqq binutils-dev festival festvox-kallpc16k ffmpeg flite google-mock gstreamer1.0-alsa gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-tools +apt-get install -yqq ifstat iproute2 iputils-ping joystick libassimp-dev libbullet-dev libgstreamer-plugins-good1.0-0 libprotobuf-dev libprotoc-dev +apt-get install -yqq libqt5svg5-dev libqt5websockets5-dev libqt5x11extras5-dev libqwt-qt5-dev +apt-get install -yqq libshiboken2-dev libxmu-dev lm-sensors protobuf-compiler +apt-get install -yqq python3-cairo python3-cairosvg python3-click python3-colorama python3-coverage python3-imageio python3-joblib python3-matplotlib python3-mock python3-nose python3-opencv python3-progressbar python3-psutil python3-pydot python3-pygraphviz +# python-pil python3-catkin-pkg-modules +apt-get install -yqq python3-pyproj python3-pyqt5.qtsvg python3-pyside2.qtsvg python3-scipy python3-serial python3-shapely python3-skimage python3-sklearn python3-tabulate python3-texttable python3-tornado python3-websocket +# python3-rosdep python3-rosdep-modules python3-rospkg-modules +apt-get install -yqq qt5-image-formats-plugins shiboken2 sysstat tango-icon-theme virtualenv + +apt-get install -yqq libpyside2-dev +apt-get install -yqq python3-sip-dev +apt-get install -yqq pyqt5-dev + +apt-get install -yqq libapriltag-dev +apt-get install -yqq vim + +apt-get install -yq libboost-test-dev libboost-timer-dev libgdal-dev libopencv-dev liboctomap-dev libpcl-dev libvtk9-dev sip-dev From 3fe3a1b4fdae9b2d803e417589785e6e2d797606 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 28 Aug 2024 09:45:55 -0700 Subject: [PATCH 65/76] updating to latest lvr2 --- ubuntu_2004/base_repos.yaml | 2 +- ubuntu_2204/base_repos.yaml | 2 +- ubuntu_2404/base_repos.yaml | 8 ++++---- ubuntu_2404/extra_repos.yaml | 2 +- ubuntu_2404/rqt_rviz_repos.yaml | 4 ---- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ubuntu_2004/base_repos.yaml b/ubuntu_2004/base_repos.yaml index a3a3c9a..295ed4b 100644 --- a/ubuntu_2004/base_repos.yaml +++ b/ubuntu_2004/base_repos.yaml @@ -147,7 +147,7 @@ repositories: other/lvr2: type: git url: https://github.com/uos/lvr2 - version: humble + version: lvr2 other/marti_messages: type: git url: https://github.com/swri-robotics/marti_messages diff --git a/ubuntu_2204/base_repos.yaml b/ubuntu_2204/base_repos.yaml index 6fe4773..43e9c82 100644 --- a/ubuntu_2204/base_repos.yaml +++ b/ubuntu_2204/base_repos.yaml @@ -270,7 +270,7 @@ repositories: other/lvr2: type: git url: git@github.com:uos/lvr2 - version: humble + version: develop other/marti_messages: type: git url: git@github.com:swri-robotics/marti_messages.git diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index cd241e0..a1dd90c 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -140,14 +140,14 @@ repositories: type: git url: https://github.com/jsk-ros-pkg/jsk_roseus version: master + people: + type: git + url: git@github.com:wg-perception/people.git + version: melodic other/libnabo: type: git url: https://github.com/ethz-asl/libnabo version: master - other/lvr2: - type: git - url: https://github.com/uos/lvr2 - version: humble other/marti_messages: type: git url: https://github.com/swri-robotics/marti_messages diff --git a/ubuntu_2404/extra_repos.yaml b/ubuntu_2404/extra_repos.yaml index d2211b7..65d44aa 100644 --- a/ubuntu_2404/extra_repos.yaml +++ b/ubuntu_2404/extra_repos.yaml @@ -275,7 +275,7 @@ repositories: other/lvr2: type: git url: git@github.com:uos/lvr2 - version: humble + version: develop other/marti_messages: type: git url: git@github.com:swri-robotics/marti_messages.git diff --git a/ubuntu_2404/rqt_rviz_repos.yaml b/ubuntu_2404/rqt_rviz_repos.yaml index 265eeb6..ca3e4f5 100644 --- a/ubuntu_2404/rqt_rviz_repos.yaml +++ b/ubuntu_2404/rqt_rviz_repos.yaml @@ -180,10 +180,6 @@ repositories: type: git url: https://github.com/ethz-asl/libnabo version: master - other/lvr2: - type: git - url: https://github.com/uos/lvr2 - version: humble other/marti_messages: type: git url: https://github.com/swri-robotics/marti_messages From d6cea035c881237b3365ed0ae768021e7f9709f0 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 28 Aug 2024 09:47:58 -0700 Subject: [PATCH 66/76] build mesh_tools and lvr2 in 22.04 action --- .github/workflows/ubuntu_22_04.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ubuntu_22_04.yml b/.github/workflows/ubuntu_22_04.yml index 2675d1e..b2d8e10 100644 --- a/.github/workflows/ubuntu_22_04.yml +++ b/.github/workflows/ubuntu_22_04.yml @@ -210,9 +210,6 @@ jobs: touch other/fuse/CATKIN_IGNORE - touch other/lvr2/CATKIN_IGNORE - touch other/mesh_tools/CATKIN_IGNORE - touch other/rtabmap/CATKIN_IGNORE touch other/rtabmap_ros/CATKIN_IGNORE From 41d5506b1fd74b13bc587cf610ac64c9acaa9e5a Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Thu, 29 Aug 2024 21:02:11 -0700 Subject: [PATCH 67/76] use noetic branch of people.git --- ubuntu_2404/base_repos.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index a1dd90c..e1e8d13 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -140,10 +140,10 @@ repositories: type: git url: https://github.com/jsk-ros-pkg/jsk_roseus version: master - people: + other/people: type: git url: git@github.com:wg-perception/people.git - version: melodic + version: noetic other/libnabo: type: git url: https://github.com/ethz-asl/libnabo From eeab2f7862312fc5f2a5c3ac1086cca023cfb3ca Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Thu, 29 Aug 2024 21:06:09 -0700 Subject: [PATCH 68/76] use noetic branch of people.git --- ubuntu_2204/base_repos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu_2204/base_repos.yaml b/ubuntu_2204/base_repos.yaml index 43e9c82..4dc35d6 100644 --- a/ubuntu_2204/base_repos.yaml +++ b/ubuntu_2204/base_repos.yaml @@ -314,7 +314,7 @@ repositories: other/people: type: git url: git@github.com:wg-perception/people.git - version: melodic + version: noetic other/pid: type: git url: git@github.com:lucasw/pid.git From 373b4838ecc761d9b455f8af827a9d8ae577b4cf Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 30 Aug 2024 05:24:48 -0700 Subject: [PATCH 69/76] only check out people.git once in 24.04 --- ubuntu_2404/base_repos.yaml | 4 ---- ubuntu_2404/extra_repos.yaml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index e1e8d13..6f77668 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -140,10 +140,6 @@ repositories: type: git url: https://github.com/jsk-ros-pkg/jsk_roseus version: master - other/people: - type: git - url: git@github.com:wg-perception/people.git - version: noetic other/libnabo: type: git url: https://github.com/ethz-asl/libnabo diff --git a/ubuntu_2404/extra_repos.yaml b/ubuntu_2404/extra_repos.yaml index 65d44aa..3b9adf4 100644 --- a/ubuntu_2404/extra_repos.yaml +++ b/ubuntu_2404/extra_repos.yaml @@ -319,7 +319,7 @@ repositories: other/people: type: git url: git@github.com:wg-perception/people.git - version: melodic + version: noetic other/pid: type: git url: git@github.com:lucasw/pid.git From 396bf92d0ef739e3cd1157c0802acf2a3c06b940 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 30 Aug 2024 05:25:17 -0700 Subject: [PATCH 70/76] separate 24.04 source build from docker build --- .github/workflows/ubuntu_22_04_docker.yml | 1 - .../{ubuntu_24_04.yaml => ubuntu_24_04.yml} | 10 +------- .github/workflows/ubuntu_24_04_docker.yml | 23 +++++++++++++++++++ 3 files changed, 24 insertions(+), 10 deletions(-) rename .github/workflows/{ubuntu_24_04.yaml => ubuntu_24_04.yml} (75%) create mode 100644 .github/workflows/ubuntu_24_04_docker.yml diff --git a/.github/workflows/ubuntu_22_04_docker.yml b/.github/workflows/ubuntu_22_04_docker.yml index b05e447..0f5a0c7 100644 --- a/.github/workflows/ubuntu_22_04_docker.yml +++ b/.github/workflows/ubuntu_22_04_docker.yml @@ -7,7 +7,6 @@ on: jobs: ubuntu2204docker: runs-on: ubuntu-22.04 - # env: steps: - name: git clone git@github.com:lucasw/ros_from_src uses: actions/checkout@v2 diff --git a/.github/workflows/ubuntu_24_04.yaml b/.github/workflows/ubuntu_24_04.yml similarity index 75% rename from .github/workflows/ubuntu_24_04.yaml rename to .github/workflows/ubuntu_24_04.yml index b965104..646b3f4 100644 --- a/.github/workflows/ubuntu_24_04.yaml +++ b/.github/workflows/ubuntu_24_04.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: jobs: - ubuntu2404dockeron2204: + ubuntu2404: runs-on: ubuntu-24.04 # env: steps: @@ -40,11 +40,3 @@ jobs: run: | cd staging underlay_ws/catkin.sh - - - name: docker build from source 24.04 - run: | - cd ros_from_src - docker build --build-arg IMAGE=ubuntu:24.04 --build-arg SUBDIR=ubuntu_2404 . -t ros2404 - - # TODO(lucasw) ubuntu_2404/Dockerfile doesn't work, was depending on the now-removed - # apt debian science ros packages diff --git a/.github/workflows/ubuntu_24_04_docker.yml b/.github/workflows/ubuntu_24_04_docker.yml new file mode 100644 index 0000000..cf9c327 --- /dev/null +++ b/.github/workflows/ubuntu_24_04_docker.yml @@ -0,0 +1,23 @@ +name: Ubuntu 24.04 Noetic ROS build from source in docker + +on: + push: + workflow_dispatch: + +jobs: + ubuntu2404docker: + runs-on: ubuntu-24.04 + steps: + - name: git clone git@github.com:lucasw/ros_from_src + uses: actions/checkout@v4 + with: + path: ros_from_src + submodules: recursive + + - name: docker build from source 24.04 + run: | + cd ros_from_src + docker build --build-arg IMAGE=ubuntu:24.04 --build-arg SUBDIR=ubuntu_2404 . -t ros2404 + + # TODO(lucasw) ubuntu_2404/Dockerfile doesn't work, was depending on the now-removed + # apt debian science ros packages From 06add0626bcb97c35a63e613d0bd46c96bf0f882 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 30 Aug 2024 05:34:22 -0700 Subject: [PATCH 71/76] use git@github.com: everywhere instead of https, and then inside docker do a search and replace to https --- Dockerfile | 2 + ubuntu_2004/base_repos.yaml | 210 +++++++++++++------------- ubuntu_2204/base_repos.yaml | 4 +- ubuntu_2404/base_repos.yaml | 206 +++++++++++++------------- ubuntu_2404/extra_repos.yaml | 4 +- ubuntu_2404/rqt_rviz_repos.yaml | 252 ++++++++++++++++---------------- underlay_repos.yaml | 80 +++++----- 7 files changed, 380 insertions(+), 378 deletions(-) diff --git a/Dockerfile b/Dockerfile index 04eac7d..05f5364 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,7 @@ RUN $SRC/ros_from_src/base_dependencies.sh # WORKDIR $SRC/ros_from_src RUN mkdir -p underlay_ws/src COPY underlay_repos.yaml underlay_ws/src +RUN sed -i 's/git@github.com:/https:\/\/github.com\//' underlay_ws/src/underlay_repos.yaml COPY git_clone.sh $SRC/ros_from_src # RUN ROS_CONSOLE=$ROSCONSOLE $SRC/ros_from_src/git_clone.sh RUN $SRC/ros_from_src/git_clone.sh @@ -46,6 +47,7 @@ RUN $SRC/ros_from_src/catkin.sh # WORKDIR $SRC/ros_from_src RUN mkdir -p base_ws/src COPY ${SUBDIR}/base_repos.yaml base_ws/src +RUN sed -i 's/git@github.com:/https:\/\/github.com\//' base_ws/src/base_repos.yaml COPY ${SUBDIR}/base_git_clone.sh $SRC/ros_from_src # RUN ROS_CONSOLE=$ROSCONSOLE $SRC/ros_from_src/git_clone.sh RUN $SRC/ros_from_src/base_git_clone.sh diff --git a/ubuntu_2004/base_repos.yaml b/ubuntu_2004/base_repos.yaml index 295ed4b..3dcecdb 100644 --- a/ubuntu_2004/base_repos.yaml +++ b/ubuntu_2004/base_repos.yaml @@ -1,418 +1,418 @@ repositories: # extra/common_msgs: # in underlay_ws # type: git - # url: https://github.com/ros/common_msgs + # url: git@github.com:ros/common_msgs # version: noetic-devel # extra/geometry: # type: git - # url: https://github.com/ros-o/geometry + # url: git@github.com:ros-o/geometry # version: obese-devel extra/laser_geometry: type: git - url: https://github.com/ros-o/laser_geometry + url: git@github.com:ros-o/laser_geometry version: obese-devel extra/navigation_msgs: type: git - url: https://github.com/ros-planning/navigation_msgs + url: git@github.com:ros-planning/navigation_msgs version: ros1 extra/pcl_msgs: type: git - url: https://github.com/ros-perception/pcl_msgs + url: git@github.com:ros-perception/pcl_msgs version: noetic-devel extra/perception_pcl: type: git - url: https://github.com/ros-o/perception_pcl + url: git@github.com:ros-o/perception_pcl version: obese-devel extra/python_qt_binding: type: git - url: https://github.com/ros-o/python_qt_binding + url: git@github.com:ros-o/python_qt_binding version: obese-devel extra/vision_opencv: type: git - url: https://github.com/ros-perception/vision_opencv + url: git@github.com:ros-perception/vision_opencv version: noetic lucasw/dynamic_reconfigure_tools: type: git - url: https://github.com/lucasw/dynamic_reconfigure_tools + url: git@github.com:lucasw/dynamic_reconfigure_tools version: master lucasw/image_manip: type: git - url: https://github.com/lucasw/image_manip + url: git@github.com:lucasw/image_manip version: fix_zero_frame_rate lucasw/nodelet_demo: type: git - url: https://github.com/lucasw/nodelet_demo + url: git@github.com:lucasw/nodelet_demo version: master lucasw/ros1_lifecycle: type: git - url: https://github.com/lucasw/ros1_lifecycle + url: git@github.com:lucasw/ros1_lifecycle version: misc_fixes lucasw/ros_example: type: git - url: https://github.com/lucasw/ros_example + url: git@github.com:lucasw/ros_example version: main lucasw/ros_system_monitor: type: git - url: https://github.com/lucasw/ros_system_monitor + url: git@github.com:lucasw/ros_system_monitor version: chrony_monitor lucasw/screengrab_ros: type: git - url: https://github.com/lucasw/screengrab_ros + url: git@github.com:lucasw/screengrab_ros version: master lucasw/signal_generator: type: git - url: https://github.com/lucasw/signal_generator + url: git@github.com:lucasw/signal_generator version: master lucasw/tf_demo: type: git - url: https://github.com/lucasw/tf_demo + url: git@github.com:lucasw/tf_demo version: old_tf_to_new_tf lucasw/timer_test: type: git - url: https://github.com/lucasw/timer_test + url: git@github.com:lucasw/timer_test version: master lucasw/topic_state: type: git - url: https://github.com/lucasw/topic_state + url: git@github.com:lucasw/topic_state version: master lucasw/transform_point_cloud: type: git - url: https://github.com/lucasw/transform_point_cloud + url: git@github.com:lucasw/transform_point_cloud version: master lucasw/v4l2ucp: type: git - url: https://github.com/lucasw/v4l2ucp + url: git@github.com:lucasw/v4l2ucp version: master lucasw/vimjay: type: git - url: https://github.com/lucasw/vimjay + url: git@github.com:lucasw/vimjay version: eliminate_build_warnings opencv_apps: type: git - # url: https://github.com/ros-perception/opencv_apps - url: https://github.com/muellerbernd/opencv_apps + # url: git@github.com:ros-perception/opencv_apps + url: git@github.com:muellerbernd/opencv_apps version: indigo other/PlotJuggler: type: git - url: https://github.com/facontidavide/PlotJuggler + url: git@github.com:facontidavide/PlotJuggler version: main other/apriltag_ros: type: git - url: https://github.com/AprilRobotics/apriltag_ros + url: git@github.com:AprilRobotics/apriltag_ros version: master other/camera_throttler_nodelets: type: git - url: https://github.com/lucasw/camera_throttler_nodelets + url: git@github.com:lucasw/camera_throttler_nodelets version: noetic_aggregated other/catkin_virtualenv: type: git - url: https://github.com/locusrobotics/catkin_virtualenv + url: git@github.com:locusrobotics/catkin_virtualenv version: master other/ddynamic_reconfigure: type: git - url: https://github.com/ros-o/ddynamic_reconfigure + url: git@github.com:ros-o/ddynamic_reconfigure version: obese-devel other/euslisp-release: type: git - url: https://github.com/tork-a/euslisp-release + url: git@github.com:tork-a/euslisp-release version: release/melodic/euslisp other/fiducials: type: git - url: https://github.com/lucasw/fiducials + url: git@github.com:lucasw/fiducials version: cmake_vision_msgs # other/geneus: # in underlay_ws # type: git - # url: https://github.com/jsk-ros-pkg/geneus + # url: git@github.com:jsk-ros-pkg/geneus # version: master other/jsk_common: type: git - url: https://github.com/lucasw/jsk_common + url: git@github.com:lucasw/jsk_common version: video_to_bag_features other/jsk_common_msgs: type: git - url: https://github.com/lucasw/jsk_common_msgs + url: git@github.com:lucasw/jsk_common_msgs version: master other/jsk_recognition: type: git - url: https://github.com/lucasw/jsk_recognition + url: git@github.com:lucasw/jsk_recognition version: pcl_vtk_isfinite other/jsk_roseus: type: git - url: https://github.com/jsk-ros-pkg/jsk_roseus + url: git@github.com:jsk-ros-pkg/jsk_roseus version: master other/libnabo: type: git - url: https://github.com/ethz-asl/libnabo + url: git@github.com:ethz-asl/libnabo version: master other/lvr2: type: git - url: https://github.com/uos/lvr2 + url: git@github.com:uos/lvr2 version: lvr2 other/marti_messages: type: git - url: https://github.com/swri-robotics/marti_messages + url: git@github.com:swri-robotics/marti_messages version: master other/message_filters: type: git - url: https://github.com/fkie/message_filters + url: git@github.com:fkie/message_filters version: master other/nmea_navsat_driver: type: git - url: https://github.com/ros-drivers/nmea_navsat_driver + url: git@github.com:ros-drivers/nmea_navsat_driver version: master other/nodelet_rosbag: type: git - url: https://github.com/lucasw/nodelet_rosbag + url: git@github.com:lucasw/nodelet_rosbag version: pluginlib_hpp other/pal_statistics: type: git - url: https://github.com/pal-robotics/pal_statistics + url: git@github.com:pal-robotics/pal_statistics version: kinetic-devel other/pid: type: git - url: https://github.com/lucasw/pid + url: git@github.com:lucasw/pid version: boost_placeholders other/plotjuggler-ros-plugins: type: git - url: https://github.com/PlotJuggler/plotjuggler-ros-plugins + url: git@github.com:PlotJuggler/plotjuggler-ros-plugins version: main other/plotjuggler_msgs: type: git - url: https://github.com/PlotJuggler/plotjuggler_msgs + url: git@github.com:PlotJuggler/plotjuggler_msgs version: main other/point_cloud_converter: type: git - url: https://github.com/pal-robotics-forks/point_cloud_converter + url: git@github.com:pal-robotics-forks/point_cloud_converter version: hydro-devel other/ros_control_boilerplate: type: git - url: https://github.com/lucasw/ros_control_boilerplate + url: git@github.com:lucasw/ros_control_boilerplate version: cpp17 other/ros_numpy: type: git - url: https://github.com/lucasw/ros_numpy + url: git@github.com:lucasw/ros_numpy version: collections_abc other/ros_rtsp: type: git - url: https://github.com/lucasw/ros_rtsp + url: git@github.com:lucasw/ros_rtsp version: pluginlib_hpp other/ros_type_introspection: type: git - url: https://github.com/lucasw/ros_type_introspection + url: git@github.com:lucasw/ros_type_introspection version: build_2204 other/rosbag_snapshot: type: git - url: https://github.com/ros/rosbag_snapshot + url: git@github.com:ros/rosbag_snapshot version: main other/static_transform_mux: type: git - url: https://github.com/tradr-project/static_transform_mux + url: git@github.com:tradr-project/static_transform_mux version: master other/tf2_2d: type: git - url: https://github.com/locusrobotics/tf2_2d + url: git@github.com:locusrobotics/tf2_2d version: devel other/wu_ros_tools: type: git - url: https://github.com/lucasw/wu_ros_tools + url: git@github.com:lucasw/wu_ros_tools version: noetic ros/audio_common: type: git - url: https://github.com/ros-drivers/audio_common + url: git@github.com:ros-drivers/audio_common version: master ros/camera_info_manager_py: type: git - url: https://github.com/lucasw/camera_info_manager_py + url: git@github.com:lucasw/camera_info_manager_py version: noetic-devel ros/common_tutorials: type: git - url: https://github.com/lucasw/common_tutorials + url: git@github.com:lucasw/common_tutorials version: boost_placeholders ros/control_msgs: type: git - url: https://github.com/ros-controls/control_msgs + url: git@github.com:ros-controls/control_msgs version: kinetic-devel ros/ddynamic_reconfigure_python: type: git - url: https://github.com/pal-robotics/ddynamic_reconfigure_python + url: git@github.com:pal-robotics/ddynamic_reconfigure_python version: master ros/diagnostics: type: git - url: https://github.com/ros/diagnostics + url: git@github.com:ros/diagnostics version: noetic-devel ros/dynamic_reconfigure: type: git - url: https://github.com/lucasw/dynamic_reconfigure + url: git@github.com:lucasw/dynamic_reconfigure version: init_default_values ros/filters: type: git - url: https://github.com/ros/filters + url: git@github.com:ros/filters version: noetic-devel ros/four_wheel_steering_msgs: type: git - url: https://github.com/ros-drivers/four_wheel_steering_msgs + url: git@github.com:ros-drivers/four_wheel_steering_msgs version: master ros/geographic_info: type: git - url: https://github.com/ros-geographic-info/geographic_info + url: git@github.com:ros-geographic-info/geographic_info version: master # ros/geometry2: # in underlay_ws # type: git - # url: https://github.com/lucasw/geometry2 + # url: git@github.com:lucasw/geometry2 # version: noetic_aggregated ros/grid_map: type: git - url: https://github.com/lucasw/grid_map + url: git@github.com:lucasw/grid_map version: tbb_2021 ros/image_common: type: git - url: https://github.com/lucasw/image_common + url: git@github.com:lucasw/image_common version: ubuntu_2210 ros/image_pipeline: type: git - url: https://github.com/lucasw/image_pipeline + url: git@github.com:lucasw/image_pipeline version: rgb_in_depth_range ros/image_transport_plugins: type: git - url: https://github.com/lucasw/image_transport_plugins + url: git@github.com:lucasw/image_transport_plugins version: enable_pub ros/joint_state_publisher: type: git - url: https://github.com/lucasw/joint_state_publisher + url: git@github.com:lucasw/joint_state_publisher version: noetic_aggregated ros/joystick_drivers: type: git - url: https://github.com/lucasw/joystick_drivers + url: git@github.com:lucasw/joystick_drivers version: warn_not_error_if_no_joy ros/laser_assembler: type: git - url: https://github.com/lucasw/laser_assembler + url: git@github.com:lucasw/laser_assembler version: noetic-devel ros/libuvc_ros: type: git - url: https://github.com/lucasw/libuvc_ros + url: git@github.com:lucasw/libuvc_ros version: libuvc_0_0_7 ros/media_export: type: git - url: https://github.com/ros/media_export + url: git@github.com:ros/media_export version: kinetic-devel ros/navigation: type: git - url: https://github.com/lucasw/navigation + url: git@github.com:lucasw/navigation version: lucasw_debug ros/nmea_msgs: type: git - url: https://github.com/ros-drivers/nmea_msgs + url: git@github.com:ros-drivers/nmea_msgs version: master ros/nodelet_core: type: git - url: https://github.com/lucasw/nodelet_core + url: git@github.com:lucasw/nodelet_core version: throttle_looping_time ros/octomap_msgs: type: git - url: https://github.com/OctoMap/octomap_msgs + url: git@github.com:OctoMap/octomap_msgs version: melodic-devel ros/realtime_tools: type: git - url: https://github.com/ros-controls/realtime_tools + url: git@github.com:ros-controls/realtime_tools version: noetic-devel ros/robot_state_publisher: type: git - url: https://github.com/lucasw/robot_state_publisher + url: git@github.com:lucasw/robot_state_publisher version: robot_state_function ros/ros_comm: # custom overlay with logging mods type: git - url: https://github.com/lucasw/ros_comm + url: git@github.com:lucasw/ros_comm version: salsa_noetic_aggregated ros/ros_control: type: git - url: https://github.com/lucasw/ros_control + url: git@github.com:lucasw/ros_control version: acceleration_limits ros/ros_controllers: type: git - url: https://github.com/lucasw/ros_controllers + url: git@github.com:lucasw/ros_controllers version: avoid_no_trajectory_defined ros/ros_tutorials: type: git - url: https://github.com/lucasw/ros_tutorials + url: git@github.com:lucasw/ros_tutorials version: boost_placeholders ros/rosconsole: # lucasw logging mods type: git - url: https://github.com/lucasw/rosconsole + url: git@github.com:lucasw/rosconsole version: ubuntu_2210 ros/roscpp_core: # lucasw fixes type: git - url: https://github.com/lucasw/roscpp_core + url: git@github.com:lucasw/roscpp_core version: duration_out_of_dual_range ros/rospack: # debian patches type: git - url: https://github.com/lucasw/rospack + url: git@github.com:lucasw/rospack version: salsa ros/rqt: type: git - url: https://github.com/lucasw/rqt + url: git@github.com:lucasw/rqt version: ubuntu_2210 ros/teleop_twist_joy: type: git - url: https://github.com/lucasw/teleop_twist_joy + url: git@github.com:lucasw/teleop_twist_joy version: cmp0115_cpp_extension ros/teleop_twist_keyboard: type: git - url: https://github.com/ros-teleop/teleop_twist_keyboard + url: git@github.com:ros-teleop/teleop_twist_keyboard version: master ros/twist_mux: type: git - url: https://github.com/lucasw/twist_mux + url: git@github.com:lucasw/twist_mux version: ubuntu2210 ros/twist_mux_msgs: type: git - url: https://github.com/ros-teleop/twist_mux_msgs + url: git@github.com:ros-teleop/twist_mux_msgs version: melodic-devel ros/unique_identifier: type: git - url: https://github.com/ros-geographic-info/unique_identifier + url: git@github.com:ros-geographic-info/unique_identifier version: master ros/urdf_geometry_parser: type: git - url: https://github.com/ros-controls/urdf_geometry_parser + url: git@github.com:ros-controls/urdf_geometry_parser version: kinetic-devel ros/urdf_parser_py: type: git - url: https://github.com/ros/urdf_parser_py + url: git@github.com:ros/urdf_parser_py version: melodic-devel ros/usb_cam: type: git - url: https://github.com/ros-drivers/usb_cam + url: git@github.com:ros-drivers/usb_cam version: develop ros/video_stream_opencv: type: git - url: https://github.com/lucasw/video_stream_opencv + url: git@github.com:lucasw/video_stream_opencv version: build_2204 ros/view_controller_msgs: type: git - url: https://github.com/ros-visualization/view_controller_msgs + url: git@github.com:ros-visualization/view_controller_msgs version: lunar-devel ros/vision_msgs: type: git - url: https://github.com/ros-perception/vision_msgs + url: git@github.com:ros-perception/vision_msgs version: noetic-devel ros/web_video_server: type: git - url: https://github.com/lucasw/web_video_server + url: git@github.com:lucasw/web_video_server version: boost_placeholders ros/xacro: type: git - url: https://github.com/lucasw/xacro + url: git@github.com:lucasw/xacro version: cleanup_roslint roso/control_toolbox: type: git - url: https://github.com/ros-o/control_toolbox + url: git@github.com:ros-o/control_toolbox version: obese-devel roso/qt_gui_core: type: git - url: https://github.com/lucasw/qt_gui_core + url: git@github.com:lucasw/qt_gui_core version: ubuntu_2210 roso/rosparam_shortcuts: type: git - url: https://github.com/lucasw/rosparam_shortcuts + url: git@github.com:lucasw/rosparam_shortcuts version: cleanup_lint diff --git a/ubuntu_2204/base_repos.yaml b/ubuntu_2204/base_repos.yaml index 4dc35d6..78271f8 100644 --- a/ubuntu_2204/base_repos.yaml +++ b/ubuntu_2204/base_repos.yaml @@ -1,7 +1,7 @@ repositories: clearpath/cpr_gazebo: type: git - url: https://github.com/clearpathrobotics/cpr_gazebo.git + url: git@github.com:clearpathrobotics/cpr_gazebo.git version: noetic-devel clearpath/husky: type: git @@ -577,7 +577,7 @@ repositories: version: master ros/rqt_reconfigure: type: git - url: https://github.com/ros-visualization/rqt_reconfigure + url: git@github.com:ros-visualization/rqt_reconfigure version: master ros/rqt_robot_monitor: type: git diff --git a/ubuntu_2404/base_repos.yaml b/ubuntu_2404/base_repos.yaml index 6f77668..b2e5b62 100644 --- a/ubuntu_2404/base_repos.yaml +++ b/ubuntu_2404/base_repos.yaml @@ -1,410 +1,410 @@ repositories: # extra/common_msgs: # in underlay_ws # type: git - # url: https://github.com/ros/common_msgs + # url: git@github.com:ros/common_msgs # version: noetic-devel # extra/geometry: # type: git - # url: https://github.com/ros-o/geometry + # url: git@github.com:ros-o/geometry # version: obese-devel extra/laser_geometry: type: git - url: https://github.com/ros-o/laser_geometry + url: git@github.com:ros-o/laser_geometry version: obese-devel extra/navigation_msgs: type: git - url: https://github.com/ros-planning/navigation_msgs + url: git@github.com:ros-planning/navigation_msgs version: ros1 extra/pcl_msgs: type: git - url: https://github.com/ros-perception/pcl_msgs + url: git@github.com:ros-perception/pcl_msgs version: noetic-devel extra/perception_pcl: type: git - url: https://github.com/ros-o/perception_pcl + url: git@github.com:ros-o/perception_pcl version: obese-devel extra/python_qt_binding: type: git - url: https://github.com/ros-o/python_qt_binding + url: git@github.com:ros-o/python_qt_binding version: obese-devel extra/vision_opencv: type: git - url: https://github.com/ros-perception/vision_opencv + url: git@github.com:ros-perception/vision_opencv version: noetic lucasw/dynamic_reconfigure_tools: type: git - url: https://github.com/lucasw/dynamic_reconfigure_tools + url: git@github.com:lucasw/dynamic_reconfigure_tools version: master lucasw/image_manip: type: git - url: https://github.com/lucasw/image_manip + url: git@github.com:lucasw/image_manip version: fix_zero_frame_rate lucasw/nodelet_demo: type: git - url: https://github.com/lucasw/nodelet_demo + url: git@github.com:lucasw/nodelet_demo version: master lucasw/ros1_lifecycle: type: git - url: https://github.com/lucasw/ros1_lifecycle + url: git@github.com:lucasw/ros1_lifecycle version: misc_fixes lucasw/ros_example: type: git - url: https://github.com/lucasw/ros_example + url: git@github.com:lucasw/ros_example version: main lucasw/ros_system_monitor: type: git - url: https://github.com/lucasw/ros_system_monitor + url: git@github.com:lucasw/ros_system_monitor version: chrony_monitor lucasw/screengrab_ros: type: git - url: https://github.com/lucasw/screengrab_ros + url: git@github.com:lucasw/screengrab_ros version: master lucasw/signal_generator: type: git - url: https://github.com/lucasw/signal_generator + url: git@github.com:lucasw/signal_generator version: master lucasw/tf_demo: type: git - url: https://github.com/lucasw/tf_demo + url: git@github.com:lucasw/tf_demo version: old_tf_to_new_tf lucasw/timer_test: type: git - url: https://github.com/lucasw/timer_test + url: git@github.com:lucasw/timer_test version: master lucasw/topic_state: type: git - url: https://github.com/lucasw/topic_state + url: git@github.com:lucasw/topic_state version: master lucasw/transform_point_cloud: type: git - url: https://github.com/lucasw/transform_point_cloud + url: git@github.com:lucasw/transform_point_cloud version: master lucasw/v4l2ucp: type: git - url: https://github.com/lucasw/v4l2ucp + url: git@github.com:lucasw/v4l2ucp version: master lucasw/vimjay: type: git - url: https://github.com/lucasw/vimjay + url: git@github.com:lucasw/vimjay version: eliminate_build_warnings opencv_apps: type: git - # url: https://github.com/ros-perception/opencv_apps - url: https://github.com/muellerbernd/opencv_apps + # url: git@github.com:ros-perception/opencv_apps + url: git@github.com:muellerbernd/opencv_apps version: indigo other/PlotJuggler: type: git - url: https://github.com/facontidavide/PlotJuggler + url: git@github.com:facontidavide/PlotJuggler version: main other/apriltag_ros: type: git - url: https://github.com/AprilRobotics/apriltag_ros + url: git@github.com:AprilRobotics/apriltag_ros version: master other/camera_throttler_nodelets: type: git - url: https://github.com/lucasw/camera_throttler_nodelets + url: git@github.com:lucasw/camera_throttler_nodelets version: noetic_aggregated other/catkin_virtualenv: type: git - url: https://github.com/locusrobotics/catkin_virtualenv + url: git@github.com:locusrobotics/catkin_virtualenv version: master other/ddynamic_reconfigure: type: git - url: https://github.com/ros-o/ddynamic_reconfigure + url: git@github.com:ros-o/ddynamic_reconfigure version: obese-devel other/euslisp-release: type: git - url: https://github.com/tork-a/euslisp-release + url: git@github.com:tork-a/euslisp-release version: release/melodic/euslisp other/fiducials: type: git - url: https://github.com/lucasw/fiducials + url: git@github.com:lucasw/fiducials version: cmake_vision_msgs # other/geneus: # in underlay_ws # type: git - # url: https://github.com/jsk-ros-pkg/geneus + # url: git@github.com:jsk-ros-pkg/geneus # version: master other/jsk_common: type: git - url: https://github.com/lucasw/jsk_common + url: git@github.com:lucasw/jsk_common version: video_to_bag_features other/jsk_common_msgs: type: git - url: https://github.com/lucasw/jsk_common_msgs + url: git@github.com:lucasw/jsk_common_msgs version: master other/jsk_recognition: type: git - url: https://github.com/lucasw/jsk_recognition + url: git@github.com:lucasw/jsk_recognition version: pcl_vtk_isfinite other/jsk_roseus: type: git - url: https://github.com/jsk-ros-pkg/jsk_roseus + url: git@github.com:jsk-ros-pkg/jsk_roseus version: master other/libnabo: type: git - url: https://github.com/ethz-asl/libnabo + url: git@github.com:ethz-asl/libnabo version: master other/marti_messages: type: git - url: https://github.com/swri-robotics/marti_messages + url: git@github.com:swri-robotics/marti_messages version: master other/message_filters: type: git - url: https://github.com/fkie/message_filters + url: git@github.com:fkie/message_filters version: master other/nmea_navsat_driver: type: git - url: https://github.com/ros-drivers/nmea_navsat_driver + url: git@github.com:ros-drivers/nmea_navsat_driver version: master other/nodelet_rosbag: type: git - url: https://github.com/lucasw/nodelet_rosbag + url: git@github.com:lucasw/nodelet_rosbag version: pluginlib_hpp other/pal_statistics: type: git - url: https://github.com/pal-robotics/pal_statistics + url: git@github.com:pal-robotics/pal_statistics version: kinetic-devel other/pid: type: git - url: https://github.com/lucasw/pid + url: git@github.com:lucasw/pid version: boost_placeholders other/plotjuggler-ros-plugins: type: git - url: https://github.com/PlotJuggler/plotjuggler-ros-plugins + url: git@github.com:PlotJuggler/plotjuggler-ros-plugins version: main other/plotjuggler_msgs: type: git - url: https://github.com/PlotJuggler/plotjuggler_msgs + url: git@github.com:PlotJuggler/plotjuggler_msgs version: main other/point_cloud_converter: type: git - url: https://github.com/pal-robotics-forks/point_cloud_converter + url: git@github.com:pal-robotics-forks/point_cloud_converter version: hydro-devel other/ros_control_boilerplate: type: git - url: https://github.com/lucasw/ros_control_boilerplate + url: git@github.com:lucasw/ros_control_boilerplate version: cpp17 other/ros_numpy: type: git - url: https://github.com/lucasw/ros_numpy + url: git@github.com:lucasw/ros_numpy version: collections_abc other/ros_rtsp: type: git - url: https://github.com/lucasw/ros_rtsp + url: git@github.com:lucasw/ros_rtsp version: pluginlib_hpp other/ros_type_introspection: type: git - url: https://github.com/lucasw/ros_type_introspection + url: git@github.com:lucasw/ros_type_introspection version: build_2204 other/rosbag_snapshot: type: git - url: https://github.com/ros/rosbag_snapshot + url: git@github.com:ros/rosbag_snapshot version: main other/static_transform_mux: type: git - url: https://github.com/tradr-project/static_transform_mux + url: git@github.com:tradr-project/static_transform_mux version: master other/tf2_2d: type: git - url: https://github.com/locusrobotics/tf2_2d + url: git@github.com:locusrobotics/tf2_2d version: devel ros/audio_common: type: git - url: https://github.com/ros-drivers/audio_common + url: git@github.com:ros-drivers/audio_common version: master ros/camera_info_manager_py: type: git - url: https://github.com/lucasw/camera_info_manager_py + url: git@github.com:lucasw/camera_info_manager_py version: noetic-devel ros/common_tutorials: type: git - url: https://github.com/lucasw/common_tutorials + url: git@github.com:lucasw/common_tutorials version: boost_placeholders ros/control_msgs: type: git - url: https://github.com/ros-controls/control_msgs + url: git@github.com:ros-controls/control_msgs version: kinetic-devel ros/ddynamic_reconfigure_python: type: git - url: https://github.com/pal-robotics/ddynamic_reconfigure_python + url: git@github.com:pal-robotics/ddynamic_reconfigure_python version: master ros/diagnostics: type: git - url: https://github.com/ros/diagnostics + url: git@github.com:ros/diagnostics version: noetic-devel ros/dynamic_reconfigure: type: git - url: https://github.com/lucasw/dynamic_reconfigure + url: git@github.com:lucasw/dynamic_reconfigure version: init_default_values ros/filters: type: git - url: https://github.com/ros/filters + url: git@github.com:ros/filters version: noetic-devel ros/four_wheel_steering_msgs: type: git - url: https://github.com/ros-drivers/four_wheel_steering_msgs + url: git@github.com:ros-drivers/four_wheel_steering_msgs version: master ros/geographic_info: type: git - url: https://github.com/ros-geographic-info/geographic_info + url: git@github.com:ros-geographic-info/geographic_info version: master # ros/geometry2: # in underlay_ws # type: git - # url: https://github.com/lucasw/geometry2 + # url: git@github.com:lucasw/geometry2 # version: noetic_aggregated ros/grid_map: type: git - url: https://github.com/lucasw/grid_map + url: git@github.com:lucasw/grid_map version: tbb_2021 ros/image_common: type: git - url: https://github.com/lucasw/image_common + url: git@github.com:lucasw/image_common version: ubuntu_2210 ros/image_pipeline: type: git - url: https://github.com/lucasw/image_pipeline + url: git@github.com:lucasw/image_pipeline version: rgb_in_depth_range ros/image_transport_plugins: type: git - url: https://github.com/lucasw/image_transport_plugins + url: git@github.com:lucasw/image_transport_plugins version: enable_pub ros/joint_state_publisher: type: git - url: https://github.com/lucasw/joint_state_publisher + url: git@github.com:lucasw/joint_state_publisher version: noetic_aggregated ros/joystick_drivers: type: git - url: https://github.com/lucasw/joystick_drivers + url: git@github.com:lucasw/joystick_drivers version: warn_not_error_if_no_joy ros/laser_assembler: type: git - url: https://github.com/lucasw/laser_assembler + url: git@github.com:lucasw/laser_assembler version: noetic-devel ros/libuvc_ros: type: git - url: https://github.com/lucasw/libuvc_ros + url: git@github.com:lucasw/libuvc_ros version: libuvc_0_0_7 ros/media_export: type: git - url: https://github.com/ros/media_export + url: git@github.com:ros/media_export version: kinetic-devel ros/navigation: type: git - url: https://github.com/lucasw/navigation + url: git@github.com:lucasw/navigation version: lucasw_debug ros/nmea_msgs: type: git - url: https://github.com/ros-drivers/nmea_msgs + url: git@github.com:ros-drivers/nmea_msgs version: master ros/nodelet_core: type: git - url: https://github.com/lucasw/nodelet_core + url: git@github.com:lucasw/nodelet_core version: throttle_looping_time ros/octomap_msgs: type: git - url: https://github.com/OctoMap/octomap_msgs + url: git@github.com:OctoMap/octomap_msgs version: melodic-devel ros/realtime_tools: type: git - url: https://github.com/ros-controls/realtime_tools + url: git@github.com:ros-controls/realtime_tools version: noetic-devel ros/robot_state_publisher: type: git - url: https://github.com/lucasw/robot_state_publisher + url: git@github.com:lucasw/robot_state_publisher version: robot_state_function ros/ros_comm: # custom overlay with logging mods type: git - url: https://github.com/lucasw/ros_comm + url: git@github.com:lucasw/ros_comm version: salsa_noetic_aggregated ros/ros_control: type: git - url: https://github.com/lucasw/ros_control + url: git@github.com:lucasw/ros_control version: acceleration_limits ros/ros_controllers: type: git - url: https://github.com/lucasw/ros_controllers + url: git@github.com:lucasw/ros_controllers version: avoid_no_trajectory_defined ros/ros_tutorials: type: git - url: https://github.com/lucasw/ros_tutorials + url: git@github.com:lucasw/ros_tutorials version: boost_placeholders ros/rosconsole: # lucasw logging mods type: git - url: https://github.com/lucasw/rosconsole + url: git@github.com:lucasw/rosconsole version: ubuntu_2210 ros/roscpp_core: # lucasw fixes type: git - url: https://github.com/lucasw/roscpp_core + url: git@github.com:lucasw/roscpp_core version: duration_out_of_dual_range ros/rospack: # debian patches type: git - url: https://github.com/lucasw/rospack + url: git@github.com:lucasw/rospack version: salsa ros/rqt: type: git - url: https://github.com/lucasw/rqt + url: git@github.com:lucasw/rqt version: ubuntu_2210 ros/teleop_twist_joy: type: git - url: https://github.com/lucasw/teleop_twist_joy + url: git@github.com:lucasw/teleop_twist_joy version: cmp0115_cpp_extension ros/teleop_twist_keyboard: type: git - url: https://github.com/ros-teleop/teleop_twist_keyboard + url: git@github.com:ros-teleop/teleop_twist_keyboard version: master ros/twist_mux: type: git - url: https://github.com/lucasw/twist_mux + url: git@github.com:lucasw/twist_mux version: ubuntu2210 ros/twist_mux_msgs: type: git - url: https://github.com/ros-teleop/twist_mux_msgs + url: git@github.com:ros-teleop/twist_mux_msgs version: melodic-devel ros/unique_identifier: type: git - url: https://github.com/ros-geographic-info/unique_identifier + url: git@github.com:ros-geographic-info/unique_identifier version: master ros/urdf_geometry_parser: type: git - url: https://github.com/ros-controls/urdf_geometry_parser + url: git@github.com:ros-controls/urdf_geometry_parser version: kinetic-devel ros/urdf_parser_py: type: git - url: https://github.com/ros/urdf_parser_py + url: git@github.com:ros/urdf_parser_py version: melodic-devel ros/usb_cam: type: git - url: https://github.com/ros-drivers/usb_cam + url: git@github.com:ros-drivers/usb_cam version: develop ros/video_stream_opencv: type: git - url: https://github.com/lucasw/video_stream_opencv + url: git@github.com:lucasw/video_stream_opencv version: build_2204 ros/view_controller_msgs: type: git - url: https://github.com/ros-visualization/view_controller_msgs + url: git@github.com:ros-visualization/view_controller_msgs version: lunar-devel ros/vision_msgs: type: git - url: https://github.com/ros-perception/vision_msgs + url: git@github.com:ros-perception/vision_msgs version: noetic-devel ros/web_video_server: type: git - url: https://github.com/lucasw/web_video_server + url: git@github.com:lucasw/web_video_server version: boost_placeholders ros/xacro: type: git - url: https://github.com/lucasw/xacro + url: git@github.com:lucasw/xacro version: cleanup_roslint roso/control_toolbox: type: git - url: https://github.com/ros-o/control_toolbox + url: git@github.com:ros-o/control_toolbox version: obese-devel roso/qt_gui_core: type: git - url: https://github.com/lucasw/qt_gui_core + url: git@github.com:lucasw/qt_gui_core version: ubuntu_2210 roso/rosparam_shortcuts: type: git - url: https://github.com/lucasw/rosparam_shortcuts + url: git@github.com:lucasw/rosparam_shortcuts version: cleanup_lint diff --git a/ubuntu_2404/extra_repos.yaml b/ubuntu_2404/extra_repos.yaml index 3b9adf4..8ad1ce9 100644 --- a/ubuntu_2404/extra_repos.yaml +++ b/ubuntu_2404/extra_repos.yaml @@ -1,7 +1,7 @@ repositories: clearpath/cpr_gazebo: type: git - url: https://github.com/clearpathrobotics/cpr_gazebo.git + url: git@github.com:clearpathrobotics/cpr_gazebo.git version: noetic-devel clearpath/husky: type: git @@ -582,7 +582,7 @@ repositories: version: master ros/rqt_reconfigure: type: git - url: https://github.com/ros-visualization/rqt_reconfigure + url: git@github.com:ros-visualization/rqt_reconfigure version: master ros/rqt_robot_monitor: type: git diff --git a/ubuntu_2404/rqt_rviz_repos.yaml b/ubuntu_2404/rqt_rviz_repos.yaml index ca3e4f5..2f82894 100644 --- a/ubuntu_2404/rqt_rviz_repos.yaml +++ b/ubuntu_2404/rqt_rviz_repos.yaml @@ -1,502 +1,502 @@ repositories: # extra/common_msgs: # in underlay_ws # type: git - # url: https://github.com/ros/common_msgs + # url: git@github.com:ros/common_msgs # version: noetic-devel # extra/geometry: # type: git - # url: https://github.com/ros-o/geometry + # url: git@github.com:ros-o/geometry # version: obese-devel extra/laser_geometry: type: git - url: https://github.com/ros-o/laser_geometry + url: git@github.com:ros-o/laser_geometry version: obese-devel extra/navigation_msgs: type: git - url: https://github.com/ros-planning/navigation_msgs + url: git@github.com:ros-planning/navigation_msgs version: ros1 extra/pcl_msgs: type: git - url: https://github.com/ros-perception/pcl_msgs + url: git@github.com:ros-perception/pcl_msgs version: noetic-devel extra/perception_pcl: type: git - url: https://github.com/ros-o/perception_pcl + url: git@github.com:ros-o/perception_pcl version: obese-devel extra/python_qt_binding: type: git - url: https://github.com/ros-o/python_qt_binding + url: git@github.com:ros-o/python_qt_binding version: obese-devel extra/vision_opencv: type: git - url: https://github.com/ros-perception/vision_opencv + url: git@github.com:ros-perception/vision_opencv version: noetic lucasw/dynamic_reconfigure_tools: type: git - url: https://github.com/lucasw/dynamic_reconfigure_tools + url: git@github.com:lucasw/dynamic_reconfigure_tools version: master lucasw/image_manip: type: git - url: https://github.com/lucasw/image_manip + url: git@github.com:lucasw/image_manip version: fix_zero_frame_rate lucasw/nodelet_demo: type: git - url: https://github.com/lucasw/nodelet_demo + url: git@github.com:lucasw/nodelet_demo version: master lucasw/ros1_lifecycle: type: git - url: https://github.com/lucasw/ros1_lifecycle + url: git@github.com:lucasw/ros1_lifecycle version: misc_fixes lucasw/ros_example: type: git - url: https://github.com/lucasw/ros_example + url: git@github.com:lucasw/ros_example version: main lucasw/ros_system_monitor: type: git - url: https://github.com/lucasw/ros_system_monitor + url: git@github.com:lucasw/ros_system_monitor version: chrony_monitor lucasw/rqt_file_dialog: type: git - url: https://github.com/lucasw/rqt_file_dialog + url: git@github.com:lucasw/rqt_file_dialog version: master lucasw/rqt_tf_echo: type: git - url: https://github.com/lucasw/rqt_tf_echo + url: git@github.com:lucasw/rqt_tf_echo version: master lucasw/rqt_topic_display: type: git - url: https://github.com/lucasw/rqt_topic_display + url: git@github.com:lucasw/rqt_topic_display version: master lucasw/rviz_camera_stream: type: git - url: https://github.com/lucasw/rviz_camera_stream + url: git@github.com:lucasw/rviz_camera_stream version: noetic-devel lucasw/rviz_interactive_tf: type: git - url: https://github.com/lucasw/rviz_interactive_tf + url: git@github.com:lucasw/rviz_interactive_tf version: master lucasw/rviz_lighting: type: git - url: https://github.com/lucasw/rviz_lighting + url: git@github.com:lucasw/rviz_lighting version: cpp17 lucasw/rviz_ortho_view_controller: type: git - url: https://github.com/lucasw/rviz_ortho_view_controller + url: git@github.com:lucasw/rviz_ortho_view_controller version: master lucasw/screengrab_ros: type: git - url: https://github.com/lucasw/screengrab_ros + url: git@github.com:lucasw/screengrab_ros version: master lucasw/signal_generator: type: git - url: https://github.com/lucasw/signal_generator + url: git@github.com:lucasw/signal_generator version: master lucasw/tf_demo: type: git - url: https://github.com/lucasw/tf_demo + url: git@github.com:lucasw/tf_demo version: old_tf_to_new_tf lucasw/timer_test: type: git - url: https://github.com/lucasw/timer_test + url: git@github.com:lucasw/timer_test version: master lucasw/topic_state: type: git - url: https://github.com/lucasw/topic_state + url: git@github.com:lucasw/topic_state version: master lucasw/transform_point_cloud: type: git - url: https://github.com/lucasw/transform_point_cloud + url: git@github.com:lucasw/transform_point_cloud version: master lucasw/v4l2ucp: type: git - url: https://github.com/lucasw/v4l2ucp + url: git@github.com:lucasw/v4l2ucp version: master lucasw/vimjay: type: git - url: https://github.com/lucasw/vimjay + url: git@github.com:lucasw/vimjay version: eliminate_build_warnings opencv_apps: type: git - # url: https://github.com/ros-perception/opencv_apps - url: https://github.com/muellerbernd/opencv_apps + # url: git@github.com:ros-perception/opencv_apps + url: git@github.com:muellerbernd/opencv_apps version: indigo other/PlotJuggler: type: git - url: https://github.com/facontidavide/PlotJuggler + url: git@github.com:facontidavide/PlotJuggler version: main other/apriltag_ros: type: git - url: https://github.com/AprilRobotics/apriltag_ros + url: git@github.com:AprilRobotics/apriltag_ros version: master other/camera_throttler_nodelets: type: git - url: https://github.com/lucasw/camera_throttler_nodelets + url: git@github.com:lucasw/camera_throttler_nodelets version: noetic_aggregated other/catkin_virtualenv: type: git - url: https://github.com/locusrobotics/catkin_virtualenv + url: git@github.com:locusrobotics/catkin_virtualenv version: master other/ddynamic_reconfigure: type: git - url: https://github.com/ros-o/ddynamic_reconfigure + url: git@github.com:ros-o/ddynamic_reconfigure version: obese-devel other/euslisp-release: type: git - url: https://github.com/tork-a/euslisp-release + url: git@github.com:tork-a/euslisp-release version: release/melodic/euslisp other/fiducials: type: git - url: https://github.com/lucasw/fiducials + url: git@github.com:lucasw/fiducials version: cmake_vision_msgs # other/geneus: # in underlay_ws # type: git - # url: https://github.com/jsk-ros-pkg/geneus + # url: git@github.com:jsk-ros-pkg/geneus # version: master other/graph_rviz_plugin: type: git - url: https://github.com/lucasw/graph_rviz_plugin + url: git@github.com:lucasw/graph_rviz_plugin version: pluginlib_hpp other/jsk_common: type: git - url: https://github.com/lucasw/jsk_common + url: git@github.com:lucasw/jsk_common version: video_to_bag_features other/jsk_common_msgs: type: git - url: https://github.com/lucasw/jsk_common_msgs + url: git@github.com:lucasw/jsk_common_msgs version: master other/jsk_recognition: type: git - url: https://github.com/lucasw/jsk_recognition + url: git@github.com:lucasw/jsk_recognition version: pcl_vtk_isfinite other/jsk_roseus: type: git - url: https://github.com/jsk-ros-pkg/jsk_roseus + url: git@github.com:jsk-ros-pkg/jsk_roseus version: master other/jsk_visualization: type: git - url: https://github.com/lucasw/jsk_visualization + url: git@github.com:lucasw/jsk_visualization version: boost_placeholders other/libnabo: type: git - url: https://github.com/ethz-asl/libnabo + url: git@github.com:ethz-asl/libnabo version: master other/marti_messages: type: git - url: https://github.com/swri-robotics/marti_messages + url: git@github.com:swri-robotics/marti_messages version: master other/message_filters: type: git - url: https://github.com/fkie/message_filters + url: git@github.com:fkie/message_filters version: master other/nmea_navsat_driver: type: git - url: https://github.com/ros-drivers/nmea_navsat_driver + url: git@github.com:ros-drivers/nmea_navsat_driver version: master other/nodelet_rosbag: type: git - url: https://github.com/lucasw/nodelet_rosbag + url: git@github.com:lucasw/nodelet_rosbag version: pluginlib_hpp other/pal_statistics: type: git - url: https://github.com/pal-robotics/pal_statistics + url: git@github.com:pal-robotics/pal_statistics version: kinetic-devel other/pid: type: git - url: https://github.com/lucasw/pid + url: git@github.com:lucasw/pid version: boost_placeholders other/plotjuggler-ros-plugins: type: git - url: https://github.com/PlotJuggler/plotjuggler-ros-plugins + url: git@github.com:PlotJuggler/plotjuggler-ros-plugins version: main other/plotjuggler_msgs: type: git - url: https://github.com/PlotJuggler/plotjuggler_msgs + url: git@github.com:PlotJuggler/plotjuggler_msgs version: main other/point_cloud_converter: type: git - url: https://github.com/pal-robotics-forks/point_cloud_converter + url: git@github.com:pal-robotics-forks/point_cloud_converter version: hydro-devel other/ros_control_boilerplate: type: git - url: https://github.com/lucasw/ros_control_boilerplate + url: git@github.com:lucasw/ros_control_boilerplate version: cpp17 other/ros_numpy: type: git - url: https://github.com/lucasw/ros_numpy + url: git@github.com:lucasw/ros_numpy version: collections_abc other/ros_rtsp: type: git - url: https://github.com/lucasw/ros_rtsp + url: git@github.com:lucasw/ros_rtsp version: pluginlib_hpp other/ros_type_introspection: type: git - url: https://github.com/lucasw/ros_type_introspection + url: git@github.com:lucasw/ros_type_introspection version: build_2204 other/rosbag_snapshot: type: git - url: https://github.com/ros/rosbag_snapshot + url: git@github.com:ros/rosbag_snapshot version: main other/rqt_ez_publisher: type: git - url: https://github.com/lucasw/rqt_ez_publisher + url: git@github.com:lucasw/rqt_ez_publisher version: ubuntu2210 other/static_transform_mux: type: git - url: https://github.com/tradr-project/static_transform_mux + url: git@github.com:tradr-project/static_transform_mux version: master other/tf2_2d: type: git - url: https://github.com/locusrobotics/tf2_2d + url: git@github.com:locusrobotics/tf2_2d version: devel other/wu_ros_tools: type: git - url: https://github.com/lucasw/wu_ros_tools + url: git@github.com:lucasw/wu_ros_tools version: noetic ros/audio_common: type: git - url: https://github.com/ros-drivers/audio_common + url: git@github.com:ros-drivers/audio_common version: master ros/camera_info_manager_py: type: git - url: https://github.com/lucasw/camera_info_manager_py + url: git@github.com:lucasw/camera_info_manager_py version: noetic-devel ros/common_tutorials: type: git - url: https://github.com/lucasw/common_tutorials + url: git@github.com:lucasw/common_tutorials version: boost_placeholders ros/control_msgs: type: git - url: https://github.com/ros-controls/control_msgs + url: git@github.com:ros-controls/control_msgs version: kinetic-devel ros/ddynamic_reconfigure_python: type: git - url: https://github.com/pal-robotics/ddynamic_reconfigure_python + url: git@github.com:pal-robotics/ddynamic_reconfigure_python version: master ros/diagnostics: type: git - url: https://github.com/ros/diagnostics + url: git@github.com:ros/diagnostics version: noetic-devel ros/dynamic_reconfigure: type: git - url: https://github.com/lucasw/dynamic_reconfigure + url: git@github.com:lucasw/dynamic_reconfigure version: init_default_values ros/filters: type: git - url: https://github.com/ros/filters + url: git@github.com:ros/filters version: noetic-devel ros/four_wheel_steering_msgs: type: git - url: https://github.com/ros-drivers/four_wheel_steering_msgs + url: git@github.com:ros-drivers/four_wheel_steering_msgs version: master ros/geographic_info: type: git - url: https://github.com/ros-geographic-info/geographic_info + url: git@github.com:ros-geographic-info/geographic_info version: master # ros/geometry2: # in underlay_ws # type: git - # url: https://github.com/lucasw/geometry2 + # url: git@github.com:lucasw/geometry2 # version: noetic_aggregated ros/grid_map: type: git - url: https://github.com/lucasw/grid_map + url: git@github.com:lucasw/grid_map version: tbb_2021 ros/image_common: type: git - url: https://github.com/lucasw/image_common + url: git@github.com:lucasw/image_common version: ubuntu_2210 ros/image_pipeline: type: git - url: https://github.com/lucasw/image_pipeline + url: git@github.com:lucasw/image_pipeline version: rgb_in_depth_range ros/image_transport_plugins: type: git - url: https://github.com/lucasw/image_transport_plugins + url: git@github.com:lucasw/image_transport_plugins version: enable_pub ros/interactive_markers: type: git - url: https://github.com/ros-visualization/interactive_markers + url: git@github.com:ros-visualization/interactive_markers version: noetic-devel ros/joint_state_publisher: type: git - url: https://github.com/lucasw/joint_state_publisher + url: git@github.com:lucasw/joint_state_publisher version: noetic_aggregated ros/joystick_drivers: type: git - url: https://github.com/lucasw/joystick_drivers + url: git@github.com:lucasw/joystick_drivers version: warn_not_error_if_no_joy ros/laser_assembler: type: git - url: https://github.com/lucasw/laser_assembler + url: git@github.com:lucasw/laser_assembler version: noetic-devel ros/libuvc_ros: type: git - url: https://github.com/lucasw/libuvc_ros + url: git@github.com:lucasw/libuvc_ros version: libuvc_0_0_7 ros/media_export: type: git - url: https://github.com/ros/media_export + url: git@github.com:ros/media_export version: kinetic-devel ros/navigation: type: git - url: https://github.com/lucasw/navigation + url: git@github.com:lucasw/navigation version: lucasw_debug ros/nmea_msgs: type: git - url: https://github.com/ros-drivers/nmea_msgs + url: git@github.com:ros-drivers/nmea_msgs version: master ros/nodelet_core: type: git - url: https://github.com/lucasw/nodelet_core + url: git@github.com:lucasw/nodelet_core version: throttle_looping_time ros/octomap_msgs: type: git - url: https://github.com/OctoMap/octomap_msgs + url: git@github.com:OctoMap/octomap_msgs version: melodic-devel ros/realtime_tools: type: git - url: https://github.com/ros-controls/realtime_tools + url: git@github.com:ros-controls/realtime_tools version: noetic-devel ros/robot_state_publisher: type: git - url: https://github.com/lucasw/robot_state_publisher + url: git@github.com:lucasw/robot_state_publisher version: robot_state_function ros/ros_comm: # custom overlay with logging mods type: git - url: https://github.com/lucasw/ros_comm + url: git@github.com:lucasw/ros_comm version: salsa_noetic_aggregated ros/ros_control: type: git - url: https://github.com/lucasw/ros_control + url: git@github.com:lucasw/ros_control version: acceleration_limits ros/ros_controllers: type: git - url: https://github.com/lucasw/ros_controllers + url: git@github.com:lucasw/ros_controllers version: avoid_no_trajectory_defined ros/ros_tutorials: type: git - url: https://github.com/lucasw/ros_tutorials + url: git@github.com:lucasw/ros_tutorials version: boost_placeholders ros/rosconsole: # lucasw logging mods type: git - url: https://github.com/lucasw/rosconsole + url: git@github.com:lucasw/rosconsole version: ubuntu_2210 ros/roscpp_core: # lucasw fixes type: git - url: https://github.com/lucasw/roscpp_core + url: git@github.com:lucasw/roscpp_core version: duration_out_of_dual_range ros/rospack: # debian patches type: git - url: https://github.com/lucasw/rospack + url: git@github.com:lucasw/rospack version: salsa ros/rqt: type: git - url: https://github.com/lucasw/rqt + url: git@github.com:lucasw/rqt version: ubuntu_2210 ros/rqt_bag: type: git - url: https://github.com/lucasw/rqt_bag + url: git@github.com:lucasw/rqt_bag version: build_2204 ros/rqt_console: type: git - url: https://github.com/ros-visualization/rqt_console + url: git@github.com:ros-visualization/rqt_console version: master ros/rqt_graph: type: git - url: https://github.com/ros-visualization/rqt_graph + url: git@github.com:ros-visualization/rqt_graph version: master ros/rqt_logger_level: type: git - url: https://github.com/ros-visualization/rqt_logger_level + url: git@github.com:ros-visualization/rqt_logger_level version: master ros/rqt_plot: type: git - url: https://github.com/ros-visualization/rqt_plot + url: git@github.com:ros-visualization/rqt_plot version: master ros/rqt_reconfigure: type: git - url: https://github.com/ros-visualization/rqt_reconfigure + url: git@github.com:ros-visualization/rqt_reconfigure version: master ros/rqt_robot_monitor: type: git - url: https://github.com/ros-visualization/rqt_robot_monitor + url: git@github.com:ros-visualization/rqt_robot_monitor version: ros1 ros/rqt_robot_steering: type: git - url: https://github.com/lucasw/rqt_robot_steering + url: git@github.com:lucasw/rqt_robot_steering version: python310 ros/rqt_tf_tree: type: git - url: https://github.com/ros-visualization/rqt_tf_tree + url: git@github.com:ros-visualization/rqt_tf_tree version: master ros/rviz: type: git - url: https://github.com/lucasw/rviz + url: git@github.com:lucasw/rviz version: misc_fixes ros/teleop_twist_joy: type: git - url: https://github.com/lucasw/teleop_twist_joy + url: git@github.com:lucasw/teleop_twist_joy version: cmp0115_cpp_extension ros/teleop_twist_keyboard: type: git - url: https://github.com/ros-teleop/teleop_twist_keyboard + url: git@github.com:ros-teleop/teleop_twist_keyboard version: master ros/twist_mux: type: git - url: https://github.com/lucasw/twist_mux + url: git@github.com:lucasw/twist_mux version: ubuntu2210 ros/twist_mux_msgs: type: git - url: https://github.com/ros-teleop/twist_mux_msgs + url: git@github.com:ros-teleop/twist_mux_msgs version: melodic-devel ros/unique_identifier: type: git - url: https://ros-geographic-info/unique_identifier + url: git@github.com:ros-geographic-info/unique_identifier version: master ros/urdf_geometry_parser: type: git - url: https://ros-controls/urdf_geometry_parser + url: git@github.com:ros-controls/urdf_geometry_parser version: kinetic-devel ros/urdf_parser_py: type: git - url: https://github.com/ros/urdf_parser_py + url: git@github.com:ros/urdf_parser_py version: melodic-devel ros/usb_cam: type: git - url: https://github.com/ros-drivers/usb_cam + url: git@github.com:ros-drivers/usb_cam version: develop ros/video_stream_opencv: type: git - url: https://github.com/lucasw/video_stream_opencv + url: git@github.com:lucasw/video_stream_opencv version: build_2204 ros/view_controller_msgs: type: git - url: https://github.com/ros-visualization/view_controller_msgs + url: git@github.com:ros-visualization/view_controller_msgs version: lunar-devel ros/vision_msgs: type: git - url: https://github.com/ros-perception/vision_msgs + url: git@github.com:ros-perception/vision_msgs version: noetic-devel ros/web_video_server: type: git - url: https://github.com/lucasw/web_video_server + url: git@github.com:lucasw/web_video_server version: boost_placeholders ros/xacro: type: git - url: https://github.com/lucasw/xacro + url: git@github.com:lucasw/xacro version: cleanup_roslint roso/control_toolbox: type: git - url: https://github.com/ros-o/control_toolbox + url: git@github.com:ros-o/control_toolbox version: obese-devel roso/qt_gui_core: type: git - url: https://github.com/lucasw/qt_gui_core + url: git@github.com:lucasw/qt_gui_core version: ubuntu_2210 roso/rosparam_shortcuts: type: git - url: https://github.com/lucasw/rosparam_shortcuts + url: git@github.com:lucasw/rosparam_shortcuts version: cleanup_lint roso/rqt_image_view: type: git - url: https://github.com/lucasw/rqt_image_view + url: git@github.com:lucasw/rqt_image_view version: detection2d_image_view diff --git a/underlay_repos.yaml b/underlay_repos.yaml index 14a78eb..d608a5b 100644 --- a/underlay_repos.yaml +++ b/underlay_repos.yaml @@ -2,153 +2,153 @@ repositories: # TODO(lucasw) separate the ros catkin packages from cmake/python packages actionlib: type: git - url: https://github.com/ros/actionlib.git + url: git@github.com:ros/actionlib.git version: noetic-devel angles: type: git - url: https://github.com/ros/angles.git + url: git@github.com:ros/angles.git version: master bond_core: type: git - url: https://github.com/ros-o/bond_core.git + url: git@github.com:ros-o/bond_core.git version: obese-devel catkin: type: git - url: https://github.com/ros-o/catkin + url: git@github.com:ros-o/catkin version: obese-devel catkin_pkg: type: git - url: https://github.com/ros-infrastructure/catkin_pkg + url: git@github.com:ros-infrastructure/catkin_pkg # version: noetic-devel catkin_tools: type: git - url: https://github.com/catkin/catkin_tools + url: git@github.com:catkin/catkin_tools class_loader: type: git - url: https://github.com/ros-o/class_loader + url: git@github.com:ros-o/class_loader version: obese-devel cmake_modules: type: git - url: https://github.com/ros/cmake_modules + url: git@github.com:ros/cmake_modules version: 0.5-devel common_msgs: type: git - url: https://github.com/ros/common_msgs.git + url: git@github.com:ros/common_msgs.git version: noetic-devel console_bridge: type: git - url: https://github.com/ros/console_bridge + url: git@github.com:ros/console_bridge version: master gencpp: type: git - url: https://github.com/ros-o/gencpp + url: git@github.com:ros-o/gencpp version: obese-devel geneus: type: git - url: https://github.com/jsk-ros-pkg/geneus + url: git@github.com:jsk-ros-pkg/geneus version: master genlisp: type: git - url: https://github.com/ros/genlisp + url: git@github.com:ros/genlisp version: kinetic-devel genmsg: type: git - url: https://github.com/ros/genmsg + url: git@github.com:ros/genmsg version: kinetic-devel gennodejs: type: git - url: https://github.com/RethinkRobotics-opensource/gennodejs + url: git@github.com:RethinkRobotics-opensource/gennodejs version: kinetic-devel genpy: type: git - url: https://github.com/ros/genpy + url: git@github.com:ros/genpy version: main geometry: type: git - url: https://github.com/ros-o/geometry.git + url: git@github.com:ros-o/geometry.git version: obese-devel geometry2: type: git - url: https://github.com/ros-o/geometry2 + url: git@github.com:ros-o/geometry2 version: obese-devel kdl_parser: type: git - url: https://github.com/ros-o/kdl_parser + url: git@github.com:ros-o/kdl_parser version: obese-devel message_generation: type: git - url: https://github.com/ros/message_generation + url: git@github.com:ros/message_generation version: kinetic-devel message_runtime: type: git - url: https://github.com/ros/message_runtime + url: git@github.com:ros/message_runtime version: kinetic-devel osrf_pycommon: type: git - url: https://github.com/osrf/osrf_pycommon + url: git@github.com:osrf/osrf_pycommon pluginlib: type: git - url: https://github.com/ros-o/pluginlib + url: git@github.com:ros-o/pluginlib version: obese-devel resource_retriever: type: git - url: https://github.com/lucasw/resource_retriever + url: git@github.com:lucasw/resource_retriever version: curl_lib ros: type: git - url: https://github.com/ros/ros + url: git@github.com:ros/ros version: noetic-devel ros_comm: type: git # TODO(lucasw) got std::shared_mutex log4cxx errors in Ubuntu 22.04 with this version - # url: https://github.com/ros-o/ros_comm + # url: git@github.com:ros-o/ros_comm # version: obese-devel - url: https://github.com/lucasw/ros_comm + url: git@github.com:lucasw/ros_comm version: salsa_noetic_aggregated ros_comm_msgs: type: git - url: https://github.com/ros/ros_comm_msgs + url: git@github.com:ros/ros_comm_msgs version: kinetic-devel ros_environment: type: git - url: https://github.com/ros-o/ros_environment + url: git@github.com:ros-o/ros_environment rosconsole: type: git - url: https://github.com/ros-o/rosconsole + url: git@github.com:ros-o/rosconsole version: obese-devel rosconsole_bridge: type: git - url: https://github.com/ros/rosconsole_bridge + url: git@github.com:ros/rosconsole_bridge version: kinetic-devel roscpp_core: type: git - url: https://github.com/ros-o/roscpp_core + url: git@github.com:ros-o/roscpp_core version: obese-devel rosdep: type: git - url: https://github.com/lucasw/rosdep + url: git@github.com:lucasw/rosdep version: disable_root_etc_ros rosdistro: type: git - url: https://github.com/ros-infrastructure/rosdistro + url: git@github.com:ros-infrastructure/rosdistro roslint: type: git - url: https://github.com/lucasw/roslint + url: git@github.com:lucasw/roslint version: roslint_rust rospack: type: git - url: https://github.com/ros/rospack + url: git@github.com:ros/rospack version: noetic-devel rospkg: type: git - url: https://github.com/ros-infrastructure/rospkg + url: git@github.com:ros-infrastructure/rospkg std_msgs: type: git - url: https://github.com/ros/std_msgs + url: git@github.com:ros/std_msgs version: kinetic-devel urdf: type: git - url: https://github.com/ros-o/urdf + url: git@github.com:ros-o/urdf version: obese-devel - # url: https://github.com/lucasw/urdf + # url: git@github.com:lucasw/urdf # version: cmake_cxx_17 From 19bc4580241f22a7e6cb251250d7aaa027fe3bcc Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 30 Aug 2024 05:51:20 -0700 Subject: [PATCH 72/76] do git@github search in github actions --- .github/workflows/ubuntu_20_04.yml | 5 +++-- .github/workflows/ubuntu_24_04.yml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index 060bfe1..a84edbe 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: jobs: - ubuntu2004and2204: + ubuntu2004: runs-on: ubuntu-20.04 # env: steps: @@ -27,8 +27,9 @@ jobs: run: | cd staging cp ../ros_from_src/*yaml underlay_ws/src + sed -i 's/git@github.com:/https:\/\/github.com\//' underlay_ws/src/underlay_repos.yaml # override rosconsole in 20.04 for log4cxx compatibility - ROSCONSOLE=https://github.com/ros/rosconsole underlay_ws/git_clone.sh + underlay_ws/git_clone.sh - name: local build run: | diff --git a/.github/workflows/ubuntu_24_04.yml b/.github/workflows/ubuntu_24_04.yml index 646b3f4..1d1cc80 100644 --- a/.github/workflows/ubuntu_24_04.yml +++ b/.github/workflows/ubuntu_24_04.yml @@ -28,8 +28,8 @@ jobs: run: | cd staging cp ../ros_from_src/*yaml underlay_ws/src - # override rosconsole in 20.04 for log4cxx compatibility - ROSCONSOLE=https://github.com/ros/rosconsole underlay_ws/git_clone.sh + sed -i 's/git@github.com:/https:\/\/github.com\//' underlay_ws/src/underlay_repos.yaml + underlay_ws/git_clone.sh - name: local build run: | From 876687137606580d91b82ea18c58f21fac95f375 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 30 Aug 2024 07:25:15 -0700 Subject: [PATCH 73/76] fix lvr2 branch to 'develop' --- ubuntu_2004/base_repos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu_2004/base_repos.yaml b/ubuntu_2004/base_repos.yaml index 3dcecdb..5d50f08 100644 --- a/ubuntu_2004/base_repos.yaml +++ b/ubuntu_2004/base_repos.yaml @@ -147,7 +147,7 @@ repositories: other/lvr2: type: git url: git@github.com:uos/lvr2 - version: lvr2 + version: develop other/marti_messages: type: git url: git@github.com:swri-robotics/marti_messages From a1ae82b04bc2cbafd07ec216246c108bf9f66928 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 30 Aug 2024 07:25:30 -0700 Subject: [PATCH 74/76] split up ubuntu 20.04 source build and docker build actions --- .github/workflows/ubuntu_20_04.yml | 5 ----- .github/workflows/ubuntu_20_04_docker.yml | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/ubuntu_20_04_docker.yml diff --git a/.github/workflows/ubuntu_20_04.yml b/.github/workflows/ubuntu_20_04.yml index a84edbe..7c49e94 100644 --- a/.github/workflows/ubuntu_20_04.yml +++ b/.github/workflows/ubuntu_20_04.yml @@ -40,8 +40,3 @@ jobs: run: | cd staging underlay_ws/catkin.sh - - - name: docker build from source 20.04 - run: | - cd ros_from_src - docker build --build-arg IMAGE=ubuntu:20.04 --build-arg SUBDIR=ubuntu_2004 . -t ros2004 diff --git a/.github/workflows/ubuntu_20_04_docker.yml b/.github/workflows/ubuntu_20_04_docker.yml new file mode 100644 index 0000000..7d33f22 --- /dev/null +++ b/.github/workflows/ubuntu_20_04_docker.yml @@ -0,0 +1,23 @@ +name: Ubuntu 20.04 Noetic ROS build from source + +on: + push: + workflow_dispatch: + +jobs: + ubuntu2004: + runs-on: ubuntu-20.04 + # env: + steps: + - name: git clone git@github.com:lucasw/ros_from_src + uses: actions/checkout@v2 + with: + path: ros_from_src + submodules: recursive + + # TODO(lucasw) probably could combine 20.04, 22.04, and 24.04 docker builds into a single action yaml + # with matrix branches that execute simultaneously + - name: docker build from source 20.04 + run: | + cd ros_from_src + docker build --build-arg IMAGE=ubuntu:20.04 --build-arg SUBDIR=ubuntu_2004 . -t ros2004 From 23780305cb35ffc8244276a484b649902c11d7c0 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 10 Nov 2024 07:31:44 -0800 Subject: [PATCH 75/76] minimal build of additional packages in ubuntu 22.04 --- ubuntu_2204/Dockerfile.minimal | 102 ++++++++++++++++++++++++ ubuntu_2204/minimal_repos.yaml | 141 +++++++++++++++++++++++++++++++++ 2 files changed, 243 insertions(+) create mode 100644 ubuntu_2204/Dockerfile.minimal create mode 100644 ubuntu_2204/minimal_repos.yaml diff --git a/ubuntu_2204/Dockerfile.minimal b/ubuntu_2204/Dockerfile.minimal new file mode 100644 index 0000000..b0d6037 --- /dev/null +++ b/ubuntu_2204/Dockerfile.minimal @@ -0,0 +1,102 @@ +# docker build . -f Dockerfile.minimal -t ros_from_src_ubuntu_2204_minimal +# build ros basic packages on top of what's available in debian in 22.04, +# doesn't build rqt or rviz +ARG IMAGE=ubuntu:22.04 +FROM ${IMAGE} +ARG IMAGE +RUN echo ${IMAGE} + +ENV DEBIAN_FRONTEND="noninteractive" + +# be able to source files +RUN rm /bin/sh && ln -s /bin/bash /bin/sh + +RUN apt-get update -yqq +RUN apt-get upgrade -yqq +RUN apt-get install -yqq apt-utils + +# apt installs +RUN apt-get update && apt-get install -yqq git +RUN apt-get update && apt-cache search ros- +RUN apt-get update && apt-cache search catkin +RUN apt-get update && apt-get install -yqq ros-* +RUN apt-get update && apt-get install -yqq catkin-lint cython3 libapriltag-dev libceres-dev libfmt-dev libfrei0r-ocaml-dev libgeographic-dev libgmock-dev libgoogle-glog-dev libgst-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libimage-view-dev liborocos-bfl-dev libpcl-ros-dev libsdl-image1.2-dev libspnav-dev liburdfdom-dev libuvc-dev libv4l-dev libyaml-cpp-dev python-is-python3 python3-tf2-geometry-msgs python3-venv vim curl jq +RUN apt-get update && apt-get install -yqq libgsl-dev wget freeglut3-dev libcgal-dev libhdf5-dev libturbojpeg0-dev libzmq3-dev +RUN apt-get -y install ocl-icd-opencl-dev opencl-headers +RUN apt-get -y install libopenvdb-dev + +ENV DEST=/opt/ros/base +RUN mkdir $DEST -p +ENV SRC=/opt/src +RUN mkdir $SRC -p + +# TODO(lucasw) turn this into a script to make it easy to use outside of docker +WORKDIR $SRC +RUN git clone https://github.com/dirk-thomas/vcstool.git +WORKDIR $SRC/vcstool +RUN python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed + +WORKDIR $SRC +RUN git clone https://github.com/osrf/osrf_pycommon.git +WORKDIR $SRC/osrf_pycommon +RUN ls -l +RUN python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed + +WORKDIR $SRC +RUN git clone https://github.com/catkin/catkin_tools.git +WORKDIR $SRC/catkin_tools +RUN python3 setup.py install --prefix=$DEST --record install_manifest.txt --single-version-externally-managed + +WORKDIR $SRC +RUN python --version | awk '{print $2}' | cut -d'.' -f1 +RUN python --version | awk '{print $2}' | cut -d'.' -f2 +# TODO(lucasw) these aren't working +# RUN export PYTHON_MAJOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f1` +# RUN export PYTHON_MINOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f2` +# RUN PYTHON_MINOR_VERSION=`python --version | awk '{print $2}' | cut -d'.' -f2` +ARG PYTHON_MAJOR_VERSION=3 +ARG PYTHON_MINOR_VERSION=10 +ENV OPT_PYTHONPATH=$DEST/lib/python$PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION/site-packages/ +RUN echo $PYTHONPATH +ENV PYTHONPATH=$OPT_PYTHONPATH +RUN echo $PYTHONPATH + +ENV PATH=$DEST/bin:$PATH +ENV CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$DEST/lib/cmake + +# WORKDIR $SRC +# RUN git clone https://github.com/lucasw/ros_from_src.git +WORKDIR $SRC/ros_from_src/ubuntu_2204 +COPY minimal_repos.yaml . +# make git clone work through vcs without git credentials +RUN sed -i 's/git@github.com:/https:\/\/github.com\//' minimal_repos.yaml + +# get packages and build +ENV WS=/base_catkin_ws/src +RUN mkdir $WS -p +WORKDIR $WS +RUN vcs import --shallow < $SRC/ros_from_src/ubuntu_2204/minimal_repos.yaml +# COPY ignore.sh $SRC/ros_from_src/ubuntu_2204/ +# RUN $SRC/ros_from_src/ubuntu_2204/ignore.sh +RUN touch ros/grid_map/grid_map_rviz_plugin/CATKIN_IGNORE + +# ENV ROS_DISTRO="noetic" +RUN echo $CMAKE_PREFIX_PATH + +WORKDIR $WS/.. +RUN catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -Wno-dev -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=$DEST/include -DCMAKE_LIBRARY_PATH=$DEST/lib +RUN catkin build --no-status -j1 image_transport +RUN catkin build --no-status -j1 grid_map_cv +RUN touch src/ros/grid_map/grid_map_demos/CATKIN_IGNORE +RUN catkin build --no-status -j1 + +# rospack list won't work by itself +# RUN source install/setup.bash && rospack list + +# TODO(lucasw) run more tests than this +RUN ln -s /base_catkin_ws/install /opt/ros/one +RUN ls -l /opt/ros/one +# make 'source' work +SHELL ["/bin/bash", "-c"] +RUN source /opt/ros/one/setup.sh && rospack list +# RUN source install/setup.sh && rostest joint_trajectory_controller joint_trajectory_controller.test diff --git a/ubuntu_2204/minimal_repos.yaml b/ubuntu_2204/minimal_repos.yaml new file mode 100644 index 0000000..359cf82 --- /dev/null +++ b/ubuntu_2204/minimal_repos.yaml @@ -0,0 +1,141 @@ +repositories: + lucasw/image_manip: + type: git + url: https://github.com/lucasw/image_manip + version: fix_zero_frame_rate + lucasw/tf_demo: + type: git + url: https://github.com/lucasw/tf_demo + version: old_tf_to_new_tf + lucasw/topic_state: + type: git + url: https://github.com/lucasw/topic_state + version: master + lucasw/transform_point_cloud: + type: git + url: https://github.com/lucasw/transform_point_cloud.git + version: master + lucasw/vimjay: + type: git + url: https://github.com/lucasw/vimjay + version: eliminate_build_warnings + other/ddynamic_reconfigure: + type: git + url: https://github.com/ros-o/ddynamic_reconfigure + version: obese-devel + other/jsk_common_msgs: + type: git + url: https://github.com/lucasw/jsk_common_msgs + version: master + # other/message_filters: + # type: git + # url: https://github.com/fkie/message_filters.git + # version: master + other/marti_messages: + type: git + url: https://github.com/swri-robotics/marti_messages.git + version: master + # other/opencv_apps: + # type: git + # url: https://github.com/ros-perception/opencv_apps.git + # version: indigo + ros/camera_info_manager_py: + type: git + url: https://github.com/lucasw/camera_info_manager_py + version: noetic-devel + ros/control_msgs: + type: git + url: https://github.com/ros-controls/control_msgs.git + version: kinetic-devel + ros/diagnostics: + type: git + url: git@github.com:ros/diagnostics.git + version: noetic-devel + ros/ddynamic_reconfigure_python: + type: git + url: https://github.com/pal-robotics/ddynamic_reconfigure_python + version: master + ros/filters: + type: git + url: git@github.com:ros/filters.git + version: noetic-devel + ros/four_wheel_steering_msgs: + type: git + url: https://github.com/ros-drivers/four_wheel_steering_msgs.git + version: master + ros/geographic_info: + type: git + url: https://github.com/ros-geographic-info/geographic_info.git + version: master + ros/geometry2: + type: git + url: https://github.com/lucasw/geometry2 + version: noetic_aggregated + ros/grid_map: + type: git + url: https://github.com/lucasw/grid_map + version: tbb_2021 + ros/image_common: + type: git + url: https://github.com/lucasw/image_common + version: ubuntu_2210 + ros/image_pipeline: + type: git + url: https://github.com/lucasw/image_pipeline + version: rgb_in_depth_range + ros/joint_state_publisher: + type: git + url: https://github.com/lucasw/joint_state_publisher + version: noetic_aggregated + ros/navigation: + type: git + url: git@github.com:lucasw/navigation + version: lucasw_debug + ros/nmea_msgs: + type: git + url: https://github.com/ros-drivers/nmea_msgs + version: master + ros/octomap_msgs: + type: git + url: https://github.com/OctoMap/octomap_msgs.git + version: melodic-devel + ros/robot_state_publisher: + type: git + url: https://github.com/lucasw/robot_state_publisher + version: robot_state_function + # ros/ros_comm: + # type: git + # url: https://github.com/lucasw/ros_comm + # version: salsa_noetic_aggregated + # ros/rosconsole: + # type: git + # url: https://github.com/lucasw/rosconsole + # version: ubuntu_2210 + # ros/roscpp_core: + # type: git + # url: https://github.com/lucasw/roscpp_core + # version: duration_out_of_dual_range + ros/roslint: + type: git + url: https://github.com/lucasw/roslint + version: roslint_rust + ros/unique_identifier: + type: git + url: https://github.com/ros-geographic-info/unique_identifier.git + version: master + ros/urdf_geometry_parser: + type: git + url: https://github.com/ros-controls/urdf_geometry_parser.git + version: kinetic-devel + ros/urdf_parser_py: + type: git + url: https://github.com/ros/urdf_parser_py.git + version: melodic-devel + ros/vision_msgs: + type: git + url: https://github.com/ros-perception/vision_msgs.git + version: noetic-devel + ros/xacro: + type: git + url: https://github.com/lucasw/xacro.git + version: cleanup_roslint From cb84ecc41555ac57e3871b1404501384fbabf46a Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 19 Nov 2024 15:54:43 -0800 Subject: [PATCH 76/76] add robot_localization to minimal build --- ubuntu_2204/Dockerfile.minimal | 1 + ubuntu_2204/minimal_repos.yaml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ubuntu_2204/Dockerfile.minimal b/ubuntu_2204/Dockerfile.minimal index b0d6037..3945c50 100644 --- a/ubuntu_2204/Dockerfile.minimal +++ b/ubuntu_2204/Dockerfile.minimal @@ -85,6 +85,7 @@ RUN echo $CMAKE_PREFIX_PATH WORKDIR $WS/.. RUN catkin config --install --cmake-args -DCMAKE_BUILD_TYPE=Release -Wno-deprecated -Wno-dev -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=$DEST/include -DCMAKE_LIBRARY_PATH=$DEST/lib +RUN catkin build --no-status -j1 robot_localization RUN catkin build --no-status -j1 image_transport RUN catkin build --no-status -j1 grid_map_cv RUN touch src/ros/grid_map/grid_map_demos/CATKIN_IGNORE diff --git a/ubuntu_2204/minimal_repos.yaml b/ubuntu_2204/minimal_repos.yaml index 359cf82..869f6e0 100644 --- a/ubuntu_2204/minimal_repos.yaml +++ b/ubuntu_2204/minimal_repos.yaml @@ -99,6 +99,10 @@ repositories: type: git url: https://github.com/OctoMap/octomap_msgs.git version: melodic-devel + ros/robot_localization: + type: git + url: git@github.com:lucasw/robot_localization + version: boost_placeholders_cpp17 ros/robot_state_publisher: type: git url: https://github.com/lucasw/robot_state_publisher