From 5213ec8b335bd020847f032bc1353e6b8184d09b Mon Sep 17 00:00:00 2001
From: Anton Maklakov <anton@espressif.com>
Date: Tue, 29 Mar 2022 13:39:44 +0700
Subject: [PATCH 1/2] docs: add libbsd-dev to linux host requirements list

---
 docs/en/api-guides/inc/linux-host-requirements.rst    | 3 +++
 docs/en/api-guides/linux-host-testing.rst             | 4 +---
 docs/en/api-guides/unit-tests.rst                     | 7 ++-----
 docs/zh_CN/api-guides/inc/linux-host-requirements.rst | 1 +
 4 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 docs/en/api-guides/inc/linux-host-requirements.rst
 create mode 100644 docs/zh_CN/api-guides/inc/linux-host-requirements.rst

diff --git a/docs/en/api-guides/inc/linux-host-requirements.rst b/docs/en/api-guides/inc/linux-host-requirements.rst
new file mode 100644
index 0000000000..13537bf100
--- /dev/null
+++ b/docs/en/api-guides/inc/linux-host-requirements.rst
@@ -0,0 +1,3 @@
+- Installed IDF including all IDF requirements
+- CMock requirements (``Ruby``)
+- System package requirements (``libbsd``, ``libbsd-dev``)
diff --git a/docs/en/api-guides/linux-host-testing.rst b/docs/en/api-guides/linux-host-testing.rst
index ee067dbc28..57ae25382d 100644
--- a/docs/en/api-guides/linux-host-testing.rst
+++ b/docs/en/api-guides/linux-host-testing.rst
@@ -60,8 +60,6 @@ The :component_file:`NVS page unit test <nvs_flash/host_test/nvs_page_test/main/
 Requirements
 ^^^^^^^^^^^^
 
-- Installed IDF including all IDF requirements
-- CMock requirements (``Ruby``)
-- ``libbsd``
+.. include:: inc/linux-host-requirements.rst
 
 The host tests have been tested on Ubuntu 20.04 with ``GCC`` version 9 and 10.
diff --git a/docs/en/api-guides/unit-tests.rst b/docs/en/api-guides/unit-tests.rst
index 33ed7c54e3..f663817afc 100644
--- a/docs/en/api-guides/unit-tests.rst
+++ b/docs/en/api-guides/unit-tests.rst
@@ -300,12 +300,9 @@ Refer to :component_file:`cmock/CMock/docs/CMock_Summary.md` for more details on
 
 Requirements
 ^^^^^^^^^^^^
-The following requirements are necessary to generate the mocks:
+The Linux target is the only target where mocking currently works. The following requirements are necessary to generate the mocks:
 
-.. list::
-    - Installed ESP-IDF with all its requirements
-    - ``ruby``
-    - On the Linux target, which is the only target where mocking currently works, ``libbsd`` is required, too
+.. include:: inc/linux-host-requirements.rst
 
 Mock a Component
 ^^^^^^^^^^^^^^^^
diff --git a/docs/zh_CN/api-guides/inc/linux-host-requirements.rst b/docs/zh_CN/api-guides/inc/linux-host-requirements.rst
new file mode 100644
index 0000000000..7b2eb305c4
--- /dev/null
+++ b/docs/zh_CN/api-guides/inc/linux-host-requirements.rst
@@ -0,0 +1 @@
+.. include:: ../../en/api-guides/inc/linux-host-requirements.rst

From ed1c1f1903ca9ca7c992c1017c593203529de913 Mon Sep 17 00:00:00 2001
From: Anton Maklakov <anton@espressif.com>
Date: Tue, 29 Mar 2022 13:42:06 +0700
Subject: [PATCH 2/2] spi_flash, linux target: explicit use strlcpy/strlcat
 from BSD string.h

---
 components/spi_flash/sim/stubs/log/include/esp_log.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/spi_flash/sim/stubs/log/include/esp_log.h b/components/spi_flash/sim/stubs/log/include/esp_log.h
index 103e7703fd..c0c37f5063 100644
--- a/components/spi_flash/sim/stubs/log/include/esp_log.h
+++ b/components/spi_flash/sim/stubs/log/include/esp_log.h
@@ -18,9 +18,6 @@
 extern "C" {
 #endif
 
-#define strlcpy(a, b, c)
-#define strlcat(a, b, c)
-
 #define heap_caps_malloc(a, b)  NULL
 #define MALLOC_CAP_INTERNAL     0
 #define MALLOC_CAP_8BIT         0