Skip to content

Commit

Permalink
Remove source packages where binary packages work. For some reason th…
Browse files Browse the repository at this point in the history
…e urdf parser needs to be rebuilt here.
  • Loading branch information
mike-matera committed Oct 10, 2024
1 parent faba90e commit 7d8b3cb
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 14 deletions.
5 changes: 3 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN apt-get update -y \
&& curl https://packages.osrfoundation.org/gazebo.gpg --output /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg \
&& echo "deb [arch=amd64,arm64 signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable jammy main" | tee /etc/apt/sources.list.d/gazebo-stable.list > /dev/null \
&& apt-get update -y \
&& apt-get install -y gz-harmonic
&& apt-get install -y gz-harmonic ros-humble-ros-gzharmonic

# Initialize rosdep
RUN sudo rosdep init
Expand All @@ -47,7 +47,8 @@ RUN groupadd --gid $USER_GID $USERNAME \
# Extra packages as needed
RUN apt install -y libgz-sim8-dev rapidjson-dev libopencv-dev libgstreamer1.0-dev \
libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-bad gstreamer1.0-libav gstreamer1.0-gl \
ros-humble-tinyxml2-vendor default-jre python3-pexpect python3-future mesa-utils strace
ros-humble-tinyxml2-vendor default-jre python3-pexpect python3-future mesa-utils strace \
ros-humble-micro-ros-msgs

# [Optional] Set the default user. Omit if you want to keep the default as root.
USER $USERNAME
Expand Down
8 changes: 0 additions & 8 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,7 @@
path = src/micro_ros_agent
url = https://github.com/micro-ROS/micro-ROS-Agent.git
branch = humble
[submodule "src/ros_gz"]
path = src/ros_gz
url = https://github.com/gazebosim/ros_gz.git
branch = humble
[submodule "src/sdformat_urdf"]
path = src/sdformat_urdf
url = https://github.com/ros/sdformat_urdf.git
branch = humble
[submodule "src/micro_ros_msgs"]
path = src/micro_ros_msgs
url = https://github.com/micro-ROS/micro_ros_msgs.git
branch = humble
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Here are some steps to test your repository. These steps work on my setup at hom
1. Build the software in your dev container:
```
colcon build
make
```
1. Source the `setup.bash` file after the build is complete.
Expand Down
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
all: colcon-build

colcon-build:
colcon build
colcon build --allow-overriding sdformat_urdf

clean:
rm -rf build/ log/ install/
1 change: 0 additions & 1 deletion src/micro_ros_msgs
Submodule micro_ros_msgs deleted from 10be4d
1 change: 0 additions & 1 deletion src/ros_gz
Submodule ros_gz deleted from 5cc92f

0 comments on commit 7d8b3cb

Please # to comment.