diff options
author | Sung-Jin Park <sj76.park@samsung.com> | 2013-08-27 03:49:27 -0400 |
---|---|---|
committer | Sung-Jin Park <sj76.park@samsung.com> | 2013-08-27 03:49:27 -0400 |
commit | aa632902b20e78a37362019fea797593fd667cd8 (patch) | |
tree | f32691789d4b1434d75a7b1fb1f21e80c8121892 | |
parent | 39b599cf975cf94d3939d214545a74712a560045 (diff) | |
download | xorg-launch-helper-aa632902b20e78a37362019fea797593fd667cd8.tar.gz xorg-launch-helper-aa632902b20e78a37362019fea797593fd667cd8.tar.bz2 xorg-launch-helper-aa632902b20e78a37362019fea797593fd667cd8.zip |
Modify xorg.service.in to support Tizen 2.2 releastsubmit/tizen_ivi_genivi/20140131.034339submit/tizen/20130912.213458submit/tizen/20130910.024848ivi_oct_m2accepted/tizen/ivi/genivi/20140131.040443accepted/tizen/20130913.064658accepted/tizen/20130912.214202accepted/tizen/20130912.214201accepted/tizen/20130910.205531accepted/tizen/20130910.203337accepted/tizen/20130910.195244accepted/tizen/20130910.183634accepted/tizen/20130910.122948tizen_ivi_geniviaccepted/tizen/ivi/genivi
Change-Id: I1d14031b3386bb36bb25609be4c5adb38c5e2ef7
-rw-r--r-- | packaging/xorg-launch-helper.spec | 8 | ||||
-rw-r--r-- | xorg.service.in | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/packaging/xorg-launch-helper.spec b/packaging/xorg-launch-helper.spec index 5992097..1f1f301 100644 --- a/packaging/xorg-launch-helper.spec +++ b/packaging/xorg-launch-helper.spec @@ -1,6 +1,6 @@ Name: xorg-launch-helper Version: 4 -Release: 1 +Release: 2 Summary: Xorg service helper Group: Graphics/X Window System @@ -36,6 +36,12 @@ install -m 644 %{SOURCE1} %{buildroot}/etc/sysconfig/xorg install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/user/ ln -sf ../xorg_done.service %{buildroot}%{_prefix}/lib/systemd/user/xorg.target.wants +# "-sharevt" option will be removed (only) for Tizen Emulator temporarily +# by the request from Tizen SDK (kernel) team. +%if 0%{?simulator} +sed -i 's/-sharevts//g' %{buildroot}/etc/sysconfig/xorg +%endif + %files %manifest %{name}.manifest %license COPYING diff --git a/xorg.service.in b/xorg.service.in index 6ee5ce0..6cda38a 100644 --- a/xorg.service.in +++ b/xorg.service.in @@ -16,8 +16,10 @@ Description=Xorg server launch helper Before=xorg.target [Service] -Type=notify -ExecStart=@prefix@/bin/xorg-launch-helper :0 -nolisten tcp -noreset vt1 +EnvironmentFile=-/etc/sysconfig/xorg +Type=forking +OOMScoreAdjust=-1000 +ExecStart=@prefix@/bin/xorg-launch-helper $OPTIONS Restart=always RestartSec=10 |