commit bb147111f4956b18c2995e3de8547dea00b48f1a
author Soby Mathew <soby.mathew@arm.com> Mon Jun 05 10:44:49 2023 +0100
committer Soby Mathew <soby.mathew@arm.com> Mon Jun 05 10:56:17 2023 +0100
tree 58d0ae750934c7ed8a4de51cb35c53d5422df363
parent f025887b5c7536563487dbd9abc547dc96c3c95e

build(mbedtls): harden patch application

The RMM repo applies patch to MbedTLS to resolve some
build errors. Previously the patch application was skipped
if the git diff resulted in some output. This patch ensures
that MbedTLS is checked out and the patch is successfully
applied for every build.

Note: Be aware that any local changes done to MbedTLS will
be reverted as part of the build process. Ensure to check-in
any changes if they are required to be included in the build.

Signed-off-by: Soby Mathew <soby.mathew@arm.com>
Change-Id: I0d174dcecccecdf1362990fbb12efadce6fe62b5

lib/mbedtls/CMakeLists.txt

diff --git a/lib/mbedtls/CMakeLists.txt b/lib/mbedtls/CMakeLists.txt
index d07aa66..7baf798 100644
--- a/lib/mbedtls/CMakeLists.txt
+++ b/lib/mbedtls/CMakeLists.txt
@@ -49,28 +49,27 @@
     "${MBEDTLS_PATCH_DIR}/0001-Remove-compiler-options-for-clang.patch"
     "${MBEDTLS_PATCH_DIR}/0002-Disable-explicit_bzero.patch"
 )
-set(EXECUTE_COMMAND "${GIT_EXECUTABLE}" diff "library/CMakeLists.txt")
-execute_process(COMMAND ${EXECUTE_COMMAND}
+
+if(NOT EXISTS ${MBEDTLS_SRC_DIR}/.git)
+    message(FATAL_ERROR "MbedTLS submodule not found")
+endif()
+
+set(REVERT_COMMAND "${GIT_EXECUTABLE}" checkout .)
+execute_process(COMMAND ${REVERT_COMMAND}
     WORKING_DIRECTORY ${MBEDTLS_SRC_DIR}
-    RESULT_VARIABLE DIFF_STATUS
-    OUTPUT_VARIABLE DIFF_OUTPUT
 )
-if (NOT DIFF_STATUS EQUAL 0)
-    message( FATAL_ERROR "Failed to check applied Mbed TLS patch")
-endif()
-if("${DIFF_OUTPUT}" STREQUAL "")
-    foreach (MBEDTLS_PATCH_FILE ${MBEDTLS_PATCH_FILES})
-        set(EXECUTE_COMMAND "${GIT_EXECUTABLE}" apply --verbose ${MBEDTLS_PATCH_FILE})
-        execute_process(COMMAND ${EXECUTE_COMMAND}
-            WORKING_DIRECTORY ${MBEDTLS_SRC_DIR}
-            RESULT_VARIABLE PATCH_STATUS
-            COMMAND_ECHO STDOUT
-        )
-        if (NOT PATCH_STATUS EQUAL 0)
-            message( FATAL_ERROR "Failed to apply patches at ${WORKING_DIRECTORY}" )
-        endif()
-    endforeach()
-endif()
+
+foreach (MBEDTLS_PATCH_FILE ${MBEDTLS_PATCH_FILES})
+    set(EXECUTE_COMMAND "${GIT_EXECUTABLE}" apply --verbose ${MBEDTLS_PATCH_FILE})
+    execute_process(COMMAND ${EXECUTE_COMMAND}
+        WORKING_DIRECTORY ${MBEDTLS_SRC_DIR}
+        RESULT_VARIABLE PATCH_STATUS
+        COMMAND_ECHO STDOUT
+    )
+    if (NOT PATCH_STATUS EQUAL 0)
+        message( FATAL_ERROR "Failed to apply patches at ${WORKING_DIRECTORY}" )
+    endif()
+endforeach()
 
 #
 # Add the mbedtls subdirectory and exclude all targets in mbedtls from