Revert "Modifying cmake TA devkit to be more similar to other TEF backends."

This reverts commit 49a434ec5a77aafcf84b085e8bb19709085ae6dd.

Change-Id: I73fb8e59fd6e6c6755914919804b6129e08582eb

diff --git a/cmake/TEFSimulatorDevkit.cmake b/cmake/TEFSimulatorDevkit.cmake
index 293dc9e..91d471e 100644 (file)
--- a/cmake/TEFSimulatorDevkit.cmake
+++ b/cmake/TEFSimulatorDevkit.cmake
@@ -30,19 +30,18 @@ IF(NOT TA_PACKAGE_BUILDER)
     MESSAGE(FATAL_ERROR "TA_PackageBuilder.sh script not found.")
 ENDIF()
 
-MACRO(TEF_GENERATE_TA_IMAGE TargetName TAElfTargetName TAManifestFile TAImageName)
-    SET(STRIPPED_TARGET_FILE ${TAElfTargetName}.strip)
+MACRO(TEF_GENERATE_TA_IMAGE TargetName TAManifestFile TAImageName)
+    SET(STRIPPED_TARGET_FILE ${CMAKE_CURRENT_BINARY_DIR}/${TargetName}.strip)
 
-    ADD_CUSTOM_COMMAND(OUTPUT ${STRIPPED_TARGET_FILE}
-        COMMAND ${CMAKE_STRIP} --strip-unneeded -o ${STRIPPED_TARGET_FILE} ${TAElfTargetName}
-        DEPENDS ${TAElfTargetName})
+    ADD_CUSTOM_COMMAND(TARGET ${TargetName} POST_BUILD
+                       COMMAND ${CMAKE_STRIP} --strip-unneeded -o ${STRIPPED_TARGET_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${TargetName}
+                       COMMENT "Stripping image")
 
-    ADD_CUSTOM_COMMAND(OUTPUT ${TAImageName}
-        COMMAND ${TA_PACKAGE_BUILDER} /usr/bin ${STRIPPED_TARGET_FILE} ${TAManifestFile}
-        DEPENDS ${STRIPPED_TARGET_FILE})
-
-   ADD_CUSTOM_TARGET(${TargetName}
-        ALL
-        DEPENDS ${TAImageName})
+    STRING(TOUPPER "${TargetName}" TargetOutName)
+    STRING(REPLACE "-" "" TargetImage ${TargetOutName})
 
+    SET(${TAImageName} ${TargetImage})
+    ADD_CUSTOM_COMMAND(TARGET ${TargetName} POST_BUILD
+                       COMMAND ${TA_PACKAGE_BUILDER} /usr/bin ${STRIPPED_TARGET_FILE} ${TAManifestFile}
+                       COMMENT "Signing and encrypting image ${${TAImageName}}")
 ENDMACRO()

diff --git a/helloworld/CMakeLists.txt b/helloworld/CMakeLists.txt
index 2a9325c..b52cad1 100644 (file)
--- a/helloworld/CMakeLists.txt
+++ b/helloworld/CMakeLists.txt
@@ -70,8 +70,8 @@ TARGET_LINK_LIBRARIES(${TARGET_HELLO_WORLD_TA}
     ${HELLO_WORLD_TA_DEPS_LIBRARIES}
     )
 
-TEF_GENERATE_TA_IMAGE(SINGED_TA ${TARGET_HELLO_WORLD_TA} ${HELLO_WORLD_TA_PATH}/hello_world.xml ${TA_NAME})
-INSTALL(FILES ${TA_NAME} DESTINATION ${TASTORE_DIR})
+TEF_GENERATE_TA_IMAGE(${TARGET_HELLO_WORLD_TA} ${HELLO_WORLD_TA_PATH}/hello_world.xml HELLO_WORLD_TA_IMAGE)
+INSTALL(FILES ${HELLO_WORLD_TA_IMAGE} DESTINATION ${TASTORE_DIR})
 
 
 ############# CA #############

diff --git a/packaging/tef-simulator-helloworld.spec b/packaging/tef-simulator-helloworld.spec
index 27153d0..457653e 100644 (file)
--- a/packaging/tef-simulator-helloworld.spec
+++ b/packaging/tef-simulator-helloworld.spec
@@ -22,8 +22,6 @@ Requires: tef-simulator
 %define build_include_dir %{buildroot}%{include_dir}
 %define build_tastore_dir %{buildroot}%{tastore_dir}
 
-%define ta_name 00000000000000000000112233445566
-
 %description
 An example Hello World application, for TEF TrustZone simulator
 testing purposes.
@@ -37,8 +35,7 @@ cd helloworld
 cmake . \
         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \
         -DBIN_DIR=%{build_bin_dir} \
-        -DTASTORE_DIR=%{build_tastore_dir} \
-        -DTA_NAME=%{ta_name}
+        -DTASTORE_DIR=%{build_tastore_dir}
 make %{?jobs:-j%jobs}
 
 %install
@@ -57,4 +54,4 @@ make install
 %license LICENSE
 %manifest tef-simulator-helloworld.manifest
 %attr(111,security_fw,security_fw) %{bin_dir}/tef-simulator-helloworld
-%attr(444,security_fw,security_fw) %{tastore_dir}/%{ta_name}
+%attr(444,security_fw,security_fw) %{tastore_dir}/00000000000000000000112233445566