jazzy update

Ar-Ray-code · May 25, 2024 · ba529a5 · ba529a5
1 parent f99549f
commit ba529a5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ foxy
 galactic
 humble
 iron
+jazzy
 rolling
 ros2.repos*
 

diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ Build ROS2 for Raspbian
 
 | Distro | Debian | arm64-desktop | arm64-full |
 | --- | --- | --- | --- |
+| jazzy | bookworm | [URL](https://s3.ap-northeast-1.wasabisys.com/download-raw/dpkg/ros2-desktop/debian/bookworm/ros-jazzy-desktop-0.3.2_20240525_arm64.deb) |
 | iron | bullseye | [URL](https://s3.ap-northeast-1.wasabisys.com/download-raw/dpkg/ros2-desktop/debian/bullseye/ros-iron-desktop-0.3.2_20230611_arm64.deb)
 | iron | bookworm | [URL](https://s3.ap-northeast-1.wasabisys.com/download-raw/dpkg/ros2-desktop/debian/bookworm/ros-iron-desktop-0.3.2_20231028_arm64.deb)
 | humble | bullseye | [URL](https://s3.ap-northeast-1.wasabisys.com/download-raw/dpkg/ros2-desktop/debian/bullseye/ros-humble-desktop-0.3.1_arm64.deb)
@@ -32,15 +33,15 @@ sudo pip install vcstool colcon-common-extensions
 ### Install (bookworm)
 
 - OS   : RaspberryPi OS bookworm arm64
-- ROS2 : ROS2 Iron
+- ROS2 : ROS2 jazzy
 
 > When using Rviz2, switch the display server from Wayland to X11.
 
 
 
 ```bash
-wget https://s3.ap-northeast-1.wasabisys.com/download-raw/dpkg/ros2-desktop/debian/bookworm/ros-iron-desktop-0.3.2_20231028_arm64.deb
-sudo apt install ./ros-iron-desktop-0.3.2_20231028_arm64.deb
+wget https://s3.ap-northeast-1.wasabisys.com/download-raw/dpkg/ros2-desktop/debian/bookworm/ros-jazzy-desktop-0.3.2_20231028_arm64.deb
+sudo apt install ./ros-jazzy-desktop-0.3.2_20231028_arm64.deb
 sudo pip install --break-system-packages vcstool colcon-common-extensions
 ```
 
@@ -169,7 +170,7 @@ If rpi-bullseye-ros2 has made your project work, please let me know!✨
 このプロジェクトは学生向けの軽量なROS2環境を提供するためにあります。
 あなたがもしこのプロジェクトに助けられた場合、その助けを継続する支援をお願いします。
 
-This project is to provide a lightweight ROS2 environment for students.
+This project is to provide a lightweight ROS2 envjazzyment for students.
 If you have been helped by this project, please help us continue that help.
 
 [sponsors/Ar-Ray-code](https://github.com/sponsors/Ar-Ray-code?preview=true)
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -56,6 +56,8 @@ RUN apt-get update && \
 	python3-jinja2 \
 	# iron
 	liblttng-ust-dev \
+	# jazzy
+	liblttng-ctl-dev \
 	# YOLOX
 	libboost-python-dev \
 	# Realsense

diff --git a/build/config/depends.txt b/build/config/depends.txt
@@ -11,6 +11,7 @@ libbullet-dev
 libeigen3-dev
 libfreetype-dev
 liblog4cxx-dev
+liblttng-ctl-dev
 liblttng-ust-dev
 libopencv-dev
 libresource-retriever-dev

diff --git a/build/create_deb.bash b/build/create_deb.bash
@@ -1,6 +1,6 @@
 SCRIPT_DIR=$(cd $(dirname $0); pwd)
 
-TARGET_DISTRO=${1-"iron"}
+TARGET_DISTRO=${1-"jazzy"}
 ARCH=${2-"arm64"}
 ROS_INSTALL_DIR=${3-"/opt/ros"}
 VERSION=$(cat ${SCRIPT_DIR}/config/version.txt)

diff --git a/build/create_ros2.bash b/build/create_ros2.bash
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 SCRIPT_DIR=`realpath $(dirname "$0")`
-DISTRO=${1:-"iron"}
-DEBIAN_DISTRO=${2:-"bullseye"}
+DISTRO=${1:-"jazzy"}
+DEBIAN_DISTRO=${2:-"bookworm"}
 BUILD_FULL_PKG=${3:-false}
 # if build_full_pkg = full, build all packages
 if [ ${BUILD_FULL_PKG} = full ]; then

diff --git a/build/ros2_ws/build.bash b/build/ros2_ws/build.bash
@@ -45,7 +45,7 @@ fi
 rosdep update
 # rosdep install -r -y -i --from-paths /ros2_ws/src/ --rosdistro ${DISTRO}
 
-if [ ${DISTRO} = "iron" ]; then
+if [ ${DISTRO} = "iron" ] || [ ${DISTRO} = "jazzy" ]; then
     rm -rf src/ignition*
 fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ foxy @@
     galactic
     humble
     iron
+    jazzy
     rolling
     ros2.repos*
@@ Expand Down @@