From d5430dd8a8a09595d2cdb3bfa282203d9e9ec437 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 13 Sep 2021 16:25:06 +0200 Subject: [PATCH 1/6] Update README.md (#386) (#388) (cherry picked from commit a4c138e3d86e5a6be21088086dc5ab0d015ef31e) Co-authored-by: Pablo Garrido --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e5550570..b98b2870 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,7 @@ Some other prerequisites needed for building a firmware using this package are: ``` sudo apt install python3-rosdep ``` +# Quick start Building for Android needs [Latest Android NDK](https://developer.android.com/ndk/downloads) to be installed and the following environment variables to be set: - ```ANDROID_ABI```: CPU variant, refer [here](https://developer.android.com/ndk/guides/abis) for details. From a83ccd731f4984a7f335ecfba52df623e43fc2de Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 15 Sep 2021 10:49:47 +0200 Subject: [PATCH 2/6] Remove references to log4cxx (#389) --- config/freertos/crazyflie21/create.sh | 1 - config/freertos/esp32/create.sh | 1 - config/freertos/nucleo_f446re/create.sh | 1 - config/freertos/nucleo_f446ze/create.sh | 1 - config/freertos/nucleo_f746zg/create.sh | 1 - config/freertos/nucleo_f767zi/create.sh | 1 - config/freertos/olimex-stm32-e407/create.sh | 1 - config/generate_lib/generic/create.sh | 1 - config/raspbian/generic/configure.sh | 3 --- config/zephyr/generic/create.sh | 1 - 10 files changed, 12 deletions(-) diff --git a/config/freertos/crazyflie21/create.sh b/config/freertos/crazyflie21/create.sh index 4d030a62..25c832d7 100755 --- a/config/freertos/crazyflie21/create.sh +++ b/config/freertos/crazyflie21/create.sh @@ -13,7 +13,6 @@ pushd $FW_TARGETDIR >/dev/null git apply $PREFIX/config/$RTOS/$PLATFORM/patchs/*.patch --directory crazyflie_firmware # ignore broken packages - touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/freertos/esp32/create.sh b/config/freertos/esp32/create.sh index 449e663f..47610713 100755 --- a/config/freertos/esp32/create.sh +++ b/config/freertos/esp32/create.sh @@ -34,7 +34,6 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/$PLATFORM/board.repos >/dev/null # ignore broken packages - touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/freertos/nucleo_f446re/create.sh b/config/freertos/nucleo_f446re/create.sh index 14ff7206..1da4f757 100755 --- a/config/freertos/nucleo_f446re/create.sh +++ b/config/freertos/nucleo_f446re/create.sh @@ -13,7 +13,6 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/$PLATFORM/board.repos # ignore broken packages - touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/freertos/nucleo_f446ze/create.sh b/config/freertos/nucleo_f446ze/create.sh index fd84f24e..ea3c029e 100755 --- a/config/freertos/nucleo_f446ze/create.sh +++ b/config/freertos/nucleo_f446ze/create.sh @@ -13,7 +13,6 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/$PLATFORM/board.repos # ignore broken packages - touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/freertos/nucleo_f746zg/create.sh b/config/freertos/nucleo_f746zg/create.sh index fd84f24e..ea3c029e 100755 --- a/config/freertos/nucleo_f746zg/create.sh +++ b/config/freertos/nucleo_f746zg/create.sh @@ -13,7 +13,6 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/$PLATFORM/board.repos # ignore broken packages - touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/freertos/nucleo_f767zi/create.sh b/config/freertos/nucleo_f767zi/create.sh index fd84f24e..ea3c029e 100755 --- a/config/freertos/nucleo_f767zi/create.sh +++ b/config/freertos/nucleo_f767zi/create.sh @@ -13,7 +13,6 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/$PLATFORM/board.repos # ignore broken packages - touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/freertos/olimex-stm32-e407/create.sh b/config/freertos/olimex-stm32-e407/create.sh index fd84f24e..ea3c029e 100755 --- a/config/freertos/olimex-stm32-e407/create.sh +++ b/config/freertos/olimex-stm32-e407/create.sh @@ -13,7 +13,6 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/$PLATFORM/board.repos # ignore broken packages - touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/generate_lib/generic/create.sh b/config/generate_lib/generic/create.sh index 14001439..b226af83 100755 --- a/config/generate_lib/generic/create.sh +++ b/config/generate_lib/generic/create.sh @@ -1,7 +1,6 @@ pushd $FW_TARGETDIR >/dev/null # ignore broken packages - touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/raspbian/generic/configure.sh b/config/raspbian/generic/configure.sh index 4637a740..e9309447 100755 --- a/config/raspbian/generic/configure.sh +++ b/config/raspbian/generic/configure.sh @@ -6,9 +6,6 @@ pushd $FW_TARGETDIR >/dev/null curl -s https://raw.githubusercontent.com/ros2/ros2/galactic/ros2.repos |\ ros2 run micro_ros_setup yaml_filter.py raspbian_apps/$CONFIG_NAME/ros2_repos.filter > ros2.repos vcs import --input ros2.repos mcu_ws/ && rm ros2.repos - if [ -d mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx ]; then - touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE - fi if [ -d mcu_ws/ros2/rosidl ]; then touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_c/COLCON_IGNORE diff --git a/config/zephyr/generic/create.sh b/config/zephyr/generic/create.sh index ffc0a644..6faafee8 100755 --- a/config/zephyr/generic/create.sh +++ b/config/zephyr/generic/create.sh @@ -47,7 +47,6 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/generic/board.repos # ignore broken packages - touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE From a9a8c79dfae5831548edae27429e48164e915c67 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 19 Oct 2021 12:00:14 +0200 Subject: [PATCH 3/6] Add android support config (#396) (#405) Signed-off-by: Joel Cao Co-authored-by: Joel Cao (cherry picked from commit 967e7ad8e0993312d0c92eb4ff8fe28a9a243d70) Co-authored-by: kneep --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index b98b2870..68be147f 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,12 @@ Some other prerequisites needed for building a firmware using this package are: ``` sudo apt install python3-rosdep ``` + +Building for Android needs [Latest Android NDK](https://developer.android.com/ndk/downloads) to be installed and the following environment variables to be set: +- ```ANDROID_ABI```: CPU variant, refer [here](https://developer.android.com/ndk/guides/abis) for details. +- ```ANDROID_NATIVE_API_LEVEL```: Android platform version, refer [here](https://developer.android.com/ndk/guides/cmake#android_native_api_level) for details. +- ```ANDROID_NDK```: root path of the installed NDK. + # Quick start Building for Android needs [Latest Android NDK](https://developer.android.com/ndk/downloads) to be installed and the following environment variables to be set: From 9df79789a08d78e43347c8e3ae8981676c559882 Mon Sep 17 00:00:00 2001 From: Antonio Cuadros Date: Fri, 19 Nov 2021 11:06:00 +0100 Subject: [PATCH 4/6] Temporal fix for cmake update --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c6c36d40..c4d7b641 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -474,7 +474,7 @@ jobs: wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' apt-get update - apt install -y python3-colcon-metadata python3-pip cmake + apt install -y python3-colcon-metadata python3-pip cmake-data=3.21.3-0kitware1ubuntu20.04.1 cmake rosdep update --rosdistro $ROS_DISTRO rosdep install -y --from-paths src --ignore-src -y From 0583364afe925bec5d572020d0c402d028a16f4f Mon Sep 17 00:00:00 2001 From: Antonio Cuadros Date: Fri, 19 Nov 2021 11:15:39 +0100 Subject: [PATCH 5/6] Fix rebase --- README.md | 7 ------- config/freertos/crazyflie21/create.sh | 1 + config/freertos/esp32/create.sh | 1 + config/freertos/nucleo_f446re/create.sh | 1 + config/freertos/nucleo_f446ze/create.sh | 1 + config/freertos/nucleo_f746zg/create.sh | 1 + config/freertos/nucleo_f767zi/create.sh | 1 + config/freertos/olimex-stm32-e407/create.sh | 1 + config/generate_lib/generic/create.sh | 1 + config/raspbian/generic/configure.sh | 3 +++ config/zephyr/generic/create.sh | 1 + 11 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 68be147f..e5550570 100644 --- a/README.md +++ b/README.md @@ -86,13 +86,6 @@ Building for Android needs [Latest Android NDK](https://developer.android.com/nd # Quick start -Building for Android needs [Latest Android NDK](https://developer.android.com/ndk/downloads) to be installed and the following environment variables to be set: -- ```ANDROID_ABI```: CPU variant, refer [here](https://developer.android.com/ndk/guides/abis) for details. -- ```ANDROID_NATIVE_API_LEVEL```: Android platform version, refer [here](https://developer.android.com/ndk/guides/cmake#android_native_api_level) for details. -- ```ANDROID_NDK```: root path of the installed NDK. - -# Quick start - Download [here](https://www.eprosima.com/index.php/downloads-all) the micro-ROS docker image that contains a pre-installed client and agent as well as some compiled examples. # Building diff --git a/config/freertos/crazyflie21/create.sh b/config/freertos/crazyflie21/create.sh index 25c832d7..4d030a62 100755 --- a/config/freertos/crazyflie21/create.sh +++ b/config/freertos/crazyflie21/create.sh @@ -13,6 +13,7 @@ pushd $FW_TARGETDIR >/dev/null git apply $PREFIX/config/$RTOS/$PLATFORM/patchs/*.patch --directory crazyflie_firmware # ignore broken packages + touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/freertos/esp32/create.sh b/config/freertos/esp32/create.sh index 47610713..449e663f 100755 --- a/config/freertos/esp32/create.sh +++ b/config/freertos/esp32/create.sh @@ -34,6 +34,7 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/$PLATFORM/board.repos >/dev/null # ignore broken packages + touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/freertos/nucleo_f446re/create.sh b/config/freertos/nucleo_f446re/create.sh index 1da4f757..14ff7206 100755 --- a/config/freertos/nucleo_f446re/create.sh +++ b/config/freertos/nucleo_f446re/create.sh @@ -13,6 +13,7 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/$PLATFORM/board.repos # ignore broken packages + touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/freertos/nucleo_f446ze/create.sh b/config/freertos/nucleo_f446ze/create.sh index ea3c029e..fd84f24e 100755 --- a/config/freertos/nucleo_f446ze/create.sh +++ b/config/freertos/nucleo_f446ze/create.sh @@ -13,6 +13,7 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/$PLATFORM/board.repos # ignore broken packages + touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/freertos/nucleo_f746zg/create.sh b/config/freertos/nucleo_f746zg/create.sh index ea3c029e..fd84f24e 100755 --- a/config/freertos/nucleo_f746zg/create.sh +++ b/config/freertos/nucleo_f746zg/create.sh @@ -13,6 +13,7 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/$PLATFORM/board.repos # ignore broken packages + touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/freertos/nucleo_f767zi/create.sh b/config/freertos/nucleo_f767zi/create.sh index ea3c029e..fd84f24e 100755 --- a/config/freertos/nucleo_f767zi/create.sh +++ b/config/freertos/nucleo_f767zi/create.sh @@ -13,6 +13,7 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/$PLATFORM/board.repos # ignore broken packages + touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/freertos/olimex-stm32-e407/create.sh b/config/freertos/olimex-stm32-e407/create.sh index ea3c029e..fd84f24e 100755 --- a/config/freertos/olimex-stm32-e407/create.sh +++ b/config/freertos/olimex-stm32-e407/create.sh @@ -13,6 +13,7 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/$PLATFORM/board.repos # ignore broken packages + touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/generate_lib/generic/create.sh b/config/generate_lib/generic/create.sh index b226af83..14001439 100755 --- a/config/generate_lib/generic/create.sh +++ b/config/generate_lib/generic/create.sh @@ -1,6 +1,7 @@ pushd $FW_TARGETDIR >/dev/null # ignore broken packages + touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE diff --git a/config/raspbian/generic/configure.sh b/config/raspbian/generic/configure.sh index e9309447..4637a740 100755 --- a/config/raspbian/generic/configure.sh +++ b/config/raspbian/generic/configure.sh @@ -6,6 +6,9 @@ pushd $FW_TARGETDIR >/dev/null curl -s https://raw.githubusercontent.com/ros2/ros2/galactic/ros2.repos |\ ros2 run micro_ros_setup yaml_filter.py raspbian_apps/$CONFIG_NAME/ros2_repos.filter > ros2.repos vcs import --input ros2.repos mcu_ws/ && rm ros2.repos + if [ -d mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx ]; then + touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE + fi if [ -d mcu_ws/ros2/rosidl ]; then touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_c/COLCON_IGNORE diff --git a/config/zephyr/generic/create.sh b/config/zephyr/generic/create.sh index 6faafee8..ffc0a644 100755 --- a/config/zephyr/generic/create.sh +++ b/config/zephyr/generic/create.sh @@ -47,6 +47,7 @@ pushd $FW_TARGETDIR >/dev/null vcs import --input $PREFIX/config/$RTOS/generic/board.repos # ignore broken packages + touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE touch mcu_ws/ros2/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE touch mcu_ws/ros2/rcl/COLCON_IGNORE touch mcu_ws/ros2/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE From 024ea379060fb08681ca6addfa1ae09959b234c1 Mon Sep 17 00:00:00 2001 From: Antonio Cuadros Date: Fri, 19 Nov 2021 11:24:14 +0100 Subject: [PATCH 6/6] Add fix to regular CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8ab085a..d2765f0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -196,7 +196,7 @@ jobs: wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' apt-get update - apt install -y python3-colcon-metadata python3-pip cmake + apt install -y python3-colcon-metadata python3-pip cmake-data=3.21.3-0kitware1ubuntu20.04.1 cmake rosdep update --rosdistro $ROS_DISTRO rosdep install -y --from-paths src --ignore-src -y