bmedtls install programs elsewheremain

1 files changed, 101 insertions, 0 deletions

diff --git a/patches/mbedtls/0001-install-programs-to-subdirectory.patch b/patches/mbedtls/0001-install-programs-to-subdirectory.patch
new file mode 100644
index 0000000..8cff5f1
--- /dev/null
+++ b/patches/mbedtls/0001-install-programs-to-subdirectory.patch
@@ -0,0 +1,101 @@
+Install mbedtls test programs to a subdirectory
+
+This is to avoid collisions (e.g. "hello").
+Index: mbedtls-2.28.8/programs/aes/CMakeLists.txt
+===================================================================
+--- mbedtls-2.28.8.orig/programs/aes/CMakeLists.txt
++++ mbedtls-2.28.8/programs/aes/CMakeLists.txt
+@@ -8,5 +8,5 @@ foreach(exe IN LISTS executables)
+ endforeach()
+ 
+ install(TARGETS ${executables}
+-        DESTINATION "bin"
++        DESTINATION "bin/mbedtls"
+         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+Index: mbedtls-2.28.8/programs/hash/CMakeLists.txt
+===================================================================
+--- mbedtls-2.28.8.orig/programs/hash/CMakeLists.txt
++++ mbedtls-2.28.8/programs/hash/CMakeLists.txt
+@@ -9,5 +9,5 @@ foreach(exe IN LISTS executables)
+ endforeach()
+ 
+ install(TARGETS ${executables}
+-        DESTINATION "bin"
++        DESTINATION "bin/mbedtls"
+         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+Index: mbedtls-2.28.8/programs/pkey/CMakeLists.txt
+===================================================================
+--- mbedtls-2.28.8.orig/programs/pkey/CMakeLists.txt
++++ mbedtls-2.28.8/programs/pkey/CMakeLists.txt
+@@ -35,5 +35,5 @@ foreach(exe IN LISTS executables_mbedcry
+ endforeach()
+ 
+ install(TARGETS ${executables_mbedtls} ${executables_mbedcrypto}
+-        DESTINATION "bin"
++        DESTINATION "bin/mbedtls"
+         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+Index: mbedtls-2.28.8/programs/psa/CMakeLists.txt
+===================================================================
+--- mbedtls-2.28.8.orig/programs/psa/CMakeLists.txt
++++ mbedtls-2.28.8/programs/psa/CMakeLists.txt
+@@ -18,4 +18,4 @@ install(TARGETS ${executables}
+ 
+ install(PROGRAMS
+             key_ladder_demo.sh
+-        DESTINATION "bin")
++        DESTINATION "bin/mbedtls")
+Index: mbedtls-2.28.8/programs/random/CMakeLists.txt
+===================================================================
+--- mbedtls-2.28.8.orig/programs/random/CMakeLists.txt
++++ mbedtls-2.28.8/programs/random/CMakeLists.txt
+@@ -10,5 +10,5 @@ foreach(exe IN LISTS executables)
+ endforeach()
+ 
+ install(TARGETS ${executables}
+-        DESTINATION "bin"
++        DESTINATION "bin/mbedtls"
+         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+Index: mbedtls-2.28.8/programs/ssl/CMakeLists.txt
+===================================================================
+--- mbedtls-2.28.8.orig/programs/ssl/CMakeLists.txt
++++ mbedtls-2.28.8/programs/ssl/CMakeLists.txt
+@@ -50,5 +50,5 @@ if(THREADS_FOUND)
+ endif(THREADS_FOUND)
+ 
+ install(TARGETS ${executables}
+-        DESTINATION "bin"
++        DESTINATION "bin/mbedtls"
+         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+Index: mbedtls-2.28.8/programs/test/CMakeLists.txt
+===================================================================
+--- mbedtls-2.28.8.orig/programs/test/CMakeLists.txt
++++ mbedtls-2.28.8/programs/test/CMakeLists.txt
+@@ -64,5 +64,5 @@ foreach(exe IN LISTS executables_libs ex
+ endforeach()
+ 
+ install(TARGETS ${executables_libs} ${executables_mbedcrypto}
+-        DESTINATION "bin"
++        DESTINATION "bin/mbedtls"
+         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+Index: mbedtls-2.28.8/programs/util/CMakeLists.txt
+===================================================================
+--- mbedtls-2.28.8.orig/programs/util/CMakeLists.txt
++++ mbedtls-2.28.8/programs/util/CMakeLists.txt
+@@ -13,5 +13,5 @@ foreach(exe IN LISTS executables)
+ endforeach()
+ 
+ install(TARGETS ${executables}
+-        DESTINATION "bin"
++        DESTINATION "bin/mbedtls"
+         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+Index: mbedtls-2.28.8/programs/x509/CMakeLists.txt
+===================================================================
+--- mbedtls-2.28.8.orig/programs/x509/CMakeLists.txt
++++ mbedtls-2.28.8/programs/x509/CMakeLists.txt
+@@ -27,5 +27,5 @@ endforeach()
+ target_link_libraries(cert_app ${mbedtls_target})
+ 
+ install(TARGETS ${executables}
+-        DESTINATION "bin"
++        DESTINATION "bin/mbedtls"
+         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)