Fix displaying black screen in common profile : move starter.service file to default...

Change-Id: Id8b51abe6b8c778c9ab6ca439c88a8e33fc7e594

diff --git a/packaging/starter.path b/packaging/starter.path
new file mode 100644 (file)
index 0000000..5abc563
--- /dev/null
+++ b/packaging/starter.path
@@ -0,0 +1,5 @@
+[Unit]
+Description=Start the "starter" program
+
+[Path]
+PathExists=/run/.wm_ready

diff --git a/packaging/starter.spec b/packaging/starter.spec
index c5b4d84..e40ecef 100644 (file)
--- a/packaging/starter.spec
+++ b/packaging/starter.spec
@@ -9,6 +9,8 @@ Group:          Applications/Core Applications
 License:       Apache-2.0
 Source0:       %{name}-%{version}.tar.gz
 Source1:       %{name}.service
+Source2:       %{name}_common.service
+Source3:       %{name}.path
 
 %if "%{profile}" == "tv" || "%{profile}" == "ivi"
 ExcludeArch: %{arm} %ix86 x86_64
@@ -22,8 +24,6 @@ BuildRequires:  pkgconfig(capi-appfw-app-manager)
 BuildRequires:  pkgconfig(capi-system-media-key)
 BuildRequires:  pkgconfig(capi-network-bluetooth)
 BuildRequires:  pkgconfig(capi-system-system-settings)
-BuildRequires:  pkgconfig(liblazymount)
-BuildRequires:  pkgconfig(libsystemd-daemon)
 
 %if "%{profile}" == "common"
 BuildRequires:  tts
@@ -37,6 +37,11 @@ BuildRequires:  pkgconfig(capi-message-port)
 BuildRequires:  pkgconfig(capi-telephony)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(efl-extension)
+BuildRequires:  pkgconfig(liblazymount)
+BuildRequires:  pkgconfig(libsystemd-daemon)
+%else if "%{profile}" == "wearable"
+BuildRequires:  pkgconfig(liblazymount)
+BuildRequires:  pkgconfig(libsystemd-daemon)
 %endif
 
 BuildRequires:  pkgconfig(feedback)
@@ -130,11 +135,18 @@ make -j1
 rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}%{__usrdir}/basic.target.wants
 mkdir -p %{buildroot}%{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
 
+%if "%{profile}" == "common"
+mkdir -p %{buildroot}%{__usrdir}/default.target.wants
+install -m 0644 %SOURCE2 %{buildroot}%{__usrdir}/starter.service
+install -m 0644 %SOURCE3 %{buildroot}%{__usrdir}/starter.path
+ln -s ../starter.path %{buildroot}%{__usrdir}/default.target.wants/starter.path
+%else
+mkdir -p %{buildroot}%{__usrdir}/basic.target.wants
 install -m 0644 %SOURCE1 %{buildroot}%{__usrdir}/starter.service
 ln -s ../starter.service %{buildroot}%{__usrdir}/basic.target.wants/starter.service
+%endif
 
 mkdir -p %{buildroot}/usr/share/license
 cp -f LICENSE %{buildroot}/usr/share/license/%{name}
@@ -150,5 +162,10 @@ sync
 %defattr(-,root,root,-)
 %{_bindir}/starter
 %{__usrdir}/starter.service
+%if "%{profile}" == "common"
+%{__usrdir}/starter.path
+%{__usrdir}/default.target.wants/starter.path
+%else
 %{__usrdir}/basic.target.wants/starter.service
+%endif
 /usr/share/license/%{name}

diff --git a/packaging/starter_common.service b/packaging/starter_common.service
new file mode 100644 (file)
index 0000000..2d8ff81
--- /dev/null
+++ b/packaging/starter_common.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Start the "starter" program
+After=ac.service
+
+[Service]
+EnvironmentFile=/run/tizen-system-env
+ExecStart=/usr/bin/starter
+Restart=always
+RestartSec=0
+KillSignal=SIGKILL