From 2580b7cb20b92598a652dcd620a1a2d7f3593dbf Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 7 Feb 2023 19:37:23 +0100
Subject: [PATCH 1/4] proper handling for git sha hash

---
 CMakeLists.txt          | 5 ++++-
 cmake/EiveHelpers.cmake | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97b1b2a0..25e63e69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,7 +171,10 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
     list(GET GIT_INFO 1 OBSW_VERSION_MAJOR)
     list(GET GIT_INFO 2 OBSW_VERSION_MINOR)
     list(GET GIT_INFO 3 OBSW_VERSION_REVISION)
-    list(GET GIT_INFO 4 OBSW_VERSION_CST_GIT_SHA1)
+    list(LENGTH GIT_INFO LIST_LEN)
+    if(LIST_LEN GREATER 4)
+        list(GET GIT_INFO 4 OBSW_VERSION_CST_GIT_SHA1)
+    endif()
     if(NOT OBSW_VERSION_MAJOR)
       set(OBSW_VERSION_MAJOR ${OBSW_VERSION_MAJOR_IF_GIT_FAILS})
     endif()
diff --git a/cmake/EiveHelpers.cmake b/cmake/EiveHelpers.cmake
index 1a717552..6410bf28 100644
--- a/cmake/EiveHelpers.cmake
+++ b/cmake/EiveHelpers.cmake
@@ -4,7 +4,7 @@
 # 2. Major version
 # 3. Minor version
 # 4. Revision
-# 5. git SHA hash and commits since tag
+# 5. (Optional) git SHA hash and commits since tag when applicable
 function(determine_version_with_git)
     include(GetGitRevisionDescription)
     git_describe(VERSION ${ARGN})
@@ -22,7 +22,10 @@ function(determine_version_with_git)
     list(APPEND GIT_INFO ${_VERSION_MAJOR})
     list(APPEND GIT_INFO ${_VERSION_MINOR})
     list(APPEND GIT_INFO ${_VERSION_PATCH})
-    list(APPEND GIT_INFO ${VERSION_SHA1})
+    if(NOT VERSION_SHA1 STREQUAL VERSION)
+        list(APPEND GIT_INFO ${VERSION_SHA1})
+    endif()
     set(GIT_INFO ${GIT_INFO} PARENT_SCOPE)
+    message(STATUS "GIT INFO: ${GIT_INFO}")
     message(STATUS "eive | Set git version info into GIT_INFO from the git tag ${VERSION}")
 endfunction()

From 7514071d799e31e4348d69ed7f697697c1b16a37 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 7 Feb 2023 19:39:29 +0100
Subject: [PATCH 2/4] remove stray printout

---
 cmake/EiveHelpers.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmake/EiveHelpers.cmake b/cmake/EiveHelpers.cmake
index 6410bf28..b210739e 100644
--- a/cmake/EiveHelpers.cmake
+++ b/cmake/EiveHelpers.cmake
@@ -26,6 +26,5 @@ function(determine_version_with_git)
         list(APPEND GIT_INFO ${VERSION_SHA1})
     endif()
     set(GIT_INFO ${GIT_INFO} PARENT_SCOPE)
-    message(STATUS "GIT INFO: ${GIT_INFO}")
     message(STATUS "eive | Set git version info into GIT_INFO from the git tag ${VERSION}")
 endfunction()

From 9373a244131b8b9dcbf8738ff34c521ace99cb45 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 7 Feb 2023 19:40:32 +0100
Subject: [PATCH 3/4] bump changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5eceb87..e6fee72b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,12 @@ change warranting a new major release:
 
 # [unreleased]
 
+## Fixed
+
+- Build system: Fixed small bug, where the version itself was
+  stored as the git SHA hash in `commonConfig.h`. This will be
+  an empty string now for regular versions.
+
 # [v1.25.0] 2023-02-06
 
 eive-tmtc version: v2.12.0

From d6a40487934e17c42b38bce1e7a85b6f04385e2c Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 8 Feb 2023 01:32:18 +0100
Subject: [PATCH 4/4] bump FSFW, TMTC and changelog

---
 CHANGELOG.md | 1 +
 fsfw         | 2 +-
 tmtc         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6fee72b..ddeee97b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ change warranting a new major release:
 - Build system: Fixed small bug, where the version itself was
   stored as the git SHA hash in `commonConfig.h`. This will be
   an empty string now for regular versions.
+- Bump FSFW for important fix in PUS mode service.
 
 # [v1.25.0] 2023-02-06
 
diff --git a/fsfw b/fsfw
index 38789e05..84dc7ac0 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 38789e053b65cfa14604fc625e7bcc8ca03a3f17
+Subproject commit 84dc7ac0ce4f16d93a6a5a5fcd453b2fde206dba
diff --git a/tmtc b/tmtc
index d6445d38..f16e27b7 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit d6445d38a8eb644a5e1bd27f0fc56d29e93c030d
+Subproject commit f16e27b79b9996f5a6c246cea560b783eb566d7e