Link tastore directory to /opt.

Simulator unpack TA, by create directory in TA path. We need to move
tastore directory to the path with write permissions.

Change-Id: I06c73e2236ac01add896f4fc428a2d6b009d0156

diff --git a/packaging/tef-simulator-helloworld.spec b/packaging/tef-simulator-helloworld.spec
index ae4b8d4..e4a8b4a 100644 (file)
--- a/packaging/tef-simulator-helloworld.spec
+++ b/packaging/tef-simulator-helloworld.spec
@@ -33,7 +33,6 @@ cd helloworld
 cmake . \
         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \
         -DBIN_DIR=%{build_bin_dir} \
-        -DINCLUDE_DIR=%{include_dir} \
         -DTASTORE_DIR=%{build_tastore_dir}
 make %{?jobs:-j%jobs}
 

diff --git a/packaging/tef-simulator.spec b/packaging/tef-simulator.spec
index 49bb866..3ce274c 100644 (file)
--- a/packaging/tef-simulator.spec
+++ b/packaging/tef-simulator.spec
@@ -25,7 +25,8 @@ PreReq: tef-libteec
 %define lib_dir %{?TZ_SYS_LIB:%TZ_SYS_LIB}%{!?TZ_SYS_LIB:%_libdir}
 %define data_dir %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:%_datadir}
 %define include_dir %{?TZ_SYS_INCLUDE:%TZ_SYS_INCLUDE}%{!?TZ_SYS_INCLUDE:%_includedir}
-%define tastore_dir %{lib_dir}/tastore
+%define tastore_dir /opt/tastore
+%define link_tastore_dir %{lib_dir}/tastore
 
 %define build_bin_dir %{buildroot}%{bin_dir}
 %define build_lib_dir %{buildroot}%{lib_dir}
@@ -93,6 +94,7 @@ make install
 %pre
 
 %post
+ln -sf %{tastore_dir} %{link_tastore_dir}
 systemctl enable tef-simulator
 
 %post -n %{name}-client

diff --git a/simulatordaemon/src/TABinaryManager/TABinaryManager.h b/simulatordaemon/src/TABinaryManager/TABinaryManager.h
index ab852b8..c1149de 100644 (file)
--- a/simulatordaemon/src/TABinaryManager/TABinaryManager.h
+++ b/simulatordaemon/src/TABinaryManager/TABinaryManager.h
@@ -38,7 +38,6 @@
 #include "tee_client_api.h"
 #include "TAManifest.h"
 #include "TAUnpack.h"
-#include "Config.h"
 #include "tee_internal_api.h"
 
 using namespace std;