From d84e00d6d5ad4dca30099510e7f4d552c70d866d Mon Sep 17 00:00:00 2001
From: Jerome Hue <hue.jerome@yahoo.fr>
Date: Thu, 9 Nov 2023 15:39:46 +0100
Subject: [PATCH 1/2] Add compile definitions for Experimental Outcome

---
 full/stm32f411.cmake | 4 ++++
 linux-x86/Dockerfile | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/full/stm32f411.cmake b/full/stm32f411.cmake
index f059c4d..cc5c45b 100644
--- a/full/stm32f411.cmake
+++ b/full/stm32f411.cmake
@@ -64,6 +64,10 @@ set(compile_and_link_options -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softf
 add_compile_options(${compile_and_link_options})
 add_compile_options(-gdwarf-2 -mthumb -g3)
 
+# Definitions for Experimental Outcome
+add_compile_definitions(SYSTEM_ERROR2_NOT_POSIX)
+add_compile_definitions(OUTCOME_DISABLE_EXECINFO)
+
 add_link_options(${compile_and_link_options})
 add_link_options(-Wl,-T${linker_script})
 add_link_options(
diff --git a/linux-x86/Dockerfile b/linux-x86/Dockerfile
index 9be5517..46087a2 100644
--- a/linux-x86/Dockerfile
+++ b/linux-x86/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.10
+FROM ubuntu:23.04
 
 ENV HOME="/"
 

From 971e538f4f7bab24690207bb2937373f40e584b9 Mon Sep 17 00:00:00 2001
From: Jerome Hue <hue.jerome@yahoo.fr>
Date: Thu, 9 Nov 2023 16:47:47 +0100
Subject: [PATCH 2/2] Fix Pip install error on Ubuntu 23.04

---
 linux-x86/Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/linux-x86/Dockerfile b/linux-x86/Dockerfile
index 46087a2..097dd64 100644
--- a/linux-x86/Dockerfile
+++ b/linux-x86/Dockerfile
@@ -16,6 +16,7 @@ RUN apt-get update -qq && apt-get install -y -qq \
     lcov \
     make \
     ninja-build \
+    pipx \
     python3-pip \
     sudo \
     vim \
@@ -34,7 +35,7 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0-linux-x86_64.tar.gz -q
 RUN sudo tar xz -f /cmake-3.22.0-linux-x86_64.tar.gz -C /opt
 # Setting PATH for both normal and sudo users
-ENV PATH="/opt/cmake-3.22.0-linux-x86_64/bin:$PATH"
+ENV PATH="/.local/bin:/opt/cmake-3.22.0-linux-x86_64/bin:$PATH"
 RUN echo "Defaults        secure_path=\"/opt/cmake-3.22.0-linux-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"" >> /etc/sudoers
 RUN cmake --version
 RUN sudo cmake --version
@@ -57,8 +58,8 @@ RUN GCC_VERSION=$(g++ -dumpfullversion) \
     fi
 
 # Install cmake-format and codespell
-RUN pip3 install cmake-format
-RUN pip3 install codespell
+RUN pipx install cmakelang # contains cmake-format
+RUN pipx install codespell
 
 # Enable tab completion for git
 RUN echo 'source /usr/share/bash-completion/completions/git' >> /.bashrc