From 90da7aa1a0c3e6076673d542281bbdb9a353887a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 15 Mar 2022 13:17:26 +0100
Subject: [PATCH] Add extra packages build to micro-ROS lib (#19) (#20)

* Add extra_packages folder

* Delete repos file

* Add extra packages explanation to Readme

* Add empty extra_packages folder to git

(cherry picked from commit 1775ac744dd6e828d54e29f0a04ee5d711cb862f)

Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>
---
 README.md               | 4 ++++
 extra_packages/.gitkeep | 0
 libmicroros.mk          | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 extra_packages/.gitkeep

diff --git a/README.md b/README.md
index 84f1cfc..2e2e572 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,10 @@ These are optional:
 pip3 install prettytable future jinja2 intelhex
 ```
 
+## Add packages
+Custom packages inside of the `extra_packages` folder will be included on the micro-ROS library build.
+This allows the use of custom messages or other ROS packages.
+
 ## Example
 
 In order to test a int32_publisher example:
diff --git a/extra_packages/.gitkeep b/extra_packages/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/libmicroros.mk b/libmicroros.mk
index c8cd0cf..545f36e 100644
--- a/libmicroros.mk
+++ b/libmicroros.mk
@@ -74,8 +74,8 @@ $(EXTENSIONS_DIR)/micro_ros_src/src:
     touch src/rclc/rclc_examples/COLCON_IGNORE; \
 	touch src/rcl/rcl_yaml_param_parser/COLCON_IGNORE; \
 	touch src/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE; \
-    touch src/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE;
-
+    touch src/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE; \
+	cp -rf $(EXTENSIONS_DIR)/extra_packages src/extra_packages || :;
 
 $(EXTENSIONS_DIR)/micro_ros_src/install: $(EXTENSIONS_DIR)/mbed_toolchain.cmake $(EXTENSIONS_DIR)/micro_ros_dev/install $(EXTENSIONS_DIR)/micro_ros_src/src
 	cd $(UROS_DIR); \