electron binary should has '_' smack label.

electron is installed under its app path that has app smack label.
thus even if it has '_' smack label, it could not be accessed by
wrt-loader that has '_' smack label.

So, it should be moved under /usr/bin/.

Change-Id: I164a7142b5fbd9e1408e7ee971a82946443a0669
Signed-off-by: jinwoo jeong <jw00.jeong@samsung.com>

diff --git a/packaging/electron-efl.manifest b/packaging/electron-efl.manifest
index e5dc2fa..8fc4f2d 100644 (file)
--- a/packaging/electron-efl.manifest
+++ b/packaging/electron-efl.manifest
@@ -4,5 +4,6 @@
     </request>
     <assign>
         <filesystem path="/usr/bin/wrt-loader" exec_label="User"/>
+        <filesystem path="/usr/bin/electron" exec_label="none"/>
     </assign>
 </manifest>

diff --git a/packaging/electron-efl.spec b/packaging/electron-efl.spec
index 5094578..f909978 100755 (executable)
--- a/packaging/electron-efl.spec
+++ b/packaging/electron-efl.spec
@@ -112,7 +112,7 @@ install -d %{buildroot}/%{_bindir}
 install -m 0644 packaging/%{_pkgid}.png             %{buildroot}/%{_icondir}
 install -m 0755 %{_out}/libnode.so                  %{buildroot}/%{_libdir}
 install -m 0755 %{_out}/wrt-loader                  %{buildroot}/%{_bindir}
-install -m 0755 %{_out}/electron                    %{buildroot}/usr/apps/org.tizen.electron-efl/bin
+install -m 0755 %{_out}/electron                    %{buildroot}/%{_bindir}/
 install -m 0755 wrt/build/script/run_was_tizen.sh   %{buildroot}/usr/apps/org.tizen.electron-efl/bin
 
 # install resource.
@@ -120,9 +120,9 @@ mkdir -p %{buildroot}/opt/usr/home/owner/data/org.tizen.electron-efl/wrt_release
 install -m 0755 %{_out}/resources/default_app.asar  %{buildroot}/opt/usr/home/owner/data/org.tizen.electron-efl
 install -m 0755 %{_out}/resources/electron.asar     %{buildroot}/opt/usr/home/owner/data/org.tizen.electron-efl
 
-ln -s /usr/apps/org.tizen.electron-efl/bin/electron %{buildroot}%{_bindir}/wrt
-ln -s /usr/apps/org.tizen.electron-efl/bin/electron %{buildroot}%{_bindir}/wrt-client
-ln -s /usr/apps/org.tizen.electron-efl/bin/electron %{buildroot}%{_bindir}/xwalk_runtime
+ln -s %{_bindir}/electron %{buildroot}%{_bindir}/wrt
+ln -s %{_bindir}/electron %{buildroot}%{_bindir}/wrt-client
+ln -s %{_bindir}/electron %{buildroot}%{_bindir}/xwalk_runtime
 cp -rf wrt/wrt_support                              %{buildroot}/opt/usr/home/owner/data/org.tizen.electron-efl
 cp -rf wrt/node_modules                             %{buildroot}/opt/usr/home/owner/data/org.tizen.electron-efl
 cp -rf wrt/package.json wrt/src/ wrt/static         %{buildroot}/opt/usr/home/owner/data/org.tizen.electron-efl/wrt_release
@@ -151,12 +151,12 @@ rm -fr %{buildroot}
 
 %files
 %manifest packaging/electron-efl.manifest
-/usr/apps/org.tizen.electron-efl/bin/electron
 /usr/apps/org.tizen.electron-efl/bin/run_was_tizen.sh
 /opt/usr/home/owner/data/org.tizen.electron-efl/*
 %{_icondir}/%{_pkgid}.png
 %{_libdir}/libnode.so
 %{_xmldir}/%{_pkgid}.xml
+%attr(755,root,root) %{_bindir}/electron
 %attr(755,root,root) %{_bindir}/wrt
 %attr(755,root,root) %{_bindir}/wrt-client
 %attr(755,root,root) %{_bindir}/wrt-loader

diff --git a/tizen/loader/wrt_loader.cc b/tizen/loader/wrt_loader.cc
index fa60f4a..57b9d3b 100644 (file)
--- a/tizen/loader/wrt_loader.cc
+++ b/tizen/loader/wrt_loader.cc
@@ -20,7 +20,7 @@
 // with "System::Privileged" label.
 int main(int argc, char* argv[]) {
   LOG(INFO) << "Begin wrt-loader";
-  void* handle = dlopen("/usr/apps/org.tizen.electron-efl/bin/electron", RTLD_NOW);
+  void* handle = dlopen("/usr/bin/electron", RTLD_NOW);
   if (!handle) {
     LOG(ERROR) << "Failed to load electorn";
     return false;

diff --git a/wrt/build/script/run_was_tizen.sh b/wrt/build/script/run_was_tizen.sh
index d20d131..8884541 100755 (executable)
--- a/wrt/build/script/run_was_tizen.sh
+++ b/wrt/build/script/run_was_tizen.sh
@@ -18,4 +18,4 @@ export WAS_APPS_REPO=$WAS_HOME/apps_repo
 export WAS_SAMPLE_PATH=$WAS_HOME/sample
 
 echo "Start launcher"
-$SCRIPTDIR/electron
+/usr/bin/electron