From 18e23b0d40c6312594da41ddef950c24fe27f590 Mon Sep 17 00:00:00 2001
From: Jakob Friedl <64070660+Geibinger@users.noreply.github.com>
Date: Wed, 16 Oct 2024 08:35:06 +0200
Subject: [PATCH 1/2] Sphinx dependency conflict fix (#740)

Signed-off-by: Geibinger <friedl.jak@gmail.com>
(cherry picked from commit 96ab3c183553becba0cc423e57f123e68da13db4)

# Conflicts:
#	config/zephyr/generic/create.sh
---
 NOTICE                          | 2 ++
 config/zephyr/generic/create.sh | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/NOTICE b/NOTICE
index 17a152ed..47ce6bdc 100644
--- a/NOTICE
+++ b/NOTICE
@@ -25,6 +25,8 @@ eProsima
     Jose Antonio Moral <joseantoniomoralparras@eprosima.com>
     Pablo Garrido <pablogarrido@eprosima.com>
 
+Jakob Friedl <friedl.jak@gmail.com>
+
 Robert Bosch GmbH
     Ingo Lütkebohle  <ingo.luetkebohle@de.bosch.com>
     Ralph Lange <ralph.lange@de.bosch.com>
diff --git a/config/zephyr/generic/create.sh b/config/zephyr/generic/create.sh
index d7671035..f0ee7bfb 100755
--- a/config/zephyr/generic/create.sh
+++ b/config/zephyr/generic/create.sh
@@ -72,6 +72,10 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/ros2/ros2_tracing/lttngpy/COLCON_IGNORE
 
     # Upgrade sphinx
+<<<<<<< HEAD
     pip install --force-reinstall Sphinx==4.2.0 --break-system-packages
+=======
+    pip install --force-reinstall docutils==0.16 Sphinx==4.2.0
+>>>>>>> 96ab3c1 (Sphinx dependency conflict fix (#740))
 
 popd >/dev/null

From 416fb93dafe658d3107e92b2d1303ac988cc4729 Mon Sep 17 00:00:00 2001
From: Pablo Garrido <pablogs9@gmail.com>
Date: Wed, 16 Oct 2024 09:48:59 +0200
Subject: [PATCH 2/2] Update create.sh

---
 config/zephyr/generic/create.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/config/zephyr/generic/create.sh b/config/zephyr/generic/create.sh
index f0ee7bfb..64b2037d 100755
--- a/config/zephyr/generic/create.sh
+++ b/config/zephyr/generic/create.sh
@@ -72,10 +72,6 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/ros2/ros2_tracing/lttngpy/COLCON_IGNORE
 
     # Upgrade sphinx
-<<<<<<< HEAD
-    pip install --force-reinstall Sphinx==4.2.0 --break-system-packages
-=======
-    pip install --force-reinstall docutils==0.16 Sphinx==4.2.0
->>>>>>> 96ab3c1 (Sphinx dependency conflict fix (#740))
+    pip install --force-reinstall docutils==0.16 Sphinx==4.2.0 --break-system-packages
 
 popd >/dev/null