From: Sooyoung Ha Date: Fri, 20 Jun 2014 05:33:00 +0000 (+0900) Subject: systemd: apply some systemd target files from system-plugin-common. X-Git-Tag: submit/tizen/20150602.060836~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F40251%2F1;p=platform%2Fadaptation%2Femulator%2Fsystem-plugin-emulator.git systemd: apply some systemd target files from system-plugin-common. /usr/lib/systemd/system/tizen-boot.target /usr/lib/systemd/system/tizen-system.target /usr/lib/systemd/system/tizen-runtime.target Conflicts: packaging/system-plugin-emulator.spec Change-Id: I5d56f00b6c337284cc142a82cfc1883cb7dea207 Signed-off-by: Sooyoung Ha --- diff --git a/filesystem/usr/lib/systemd/system/tizen-boot.target b/filesystem/usr/lib/systemd/system/tizen-boot.target new file mode 100644 index 0000000..1533be5 --- /dev/null +++ b/filesystem/usr/lib/systemd/system/tizen-boot.target @@ -0,0 +1,6 @@ +[Unit] +Description=Tizen Boot +Requires=basic.target +Conflicts=rescue.service rescue.target +After=basic.target rescue.service rescue.target +Before=multi-user.target diff --git a/filesystem/usr/lib/systemd/system/tizen-runtime.target b/filesystem/usr/lib/systemd/system/tizen-runtime.target new file mode 100644 index 0000000..b1bc216 --- /dev/null +++ b/filesystem/usr/lib/systemd/system/tizen-runtime.target @@ -0,0 +1,6 @@ +[Unit] +Description=Tizen Runtime +Requires=basic.target tizen-boot.target tizen-system.target +Conflicts=rescue.service rescue.target +After=basic.target tizen-boot.target tizen-system.target rescue.service rescue.target +Before=multi-user.target diff --git a/filesystem/usr/lib/systemd/system/tizen-system.target b/filesystem/usr/lib/systemd/system/tizen-system.target new file mode 100644 index 0000000..4240819 --- /dev/null +++ b/filesystem/usr/lib/systemd/system/tizen-system.target @@ -0,0 +1,6 @@ +[Unit] +Description=Tizen System +Requires=basic.target tizen-boot.target +Conflicts=rescue.service rescue.target +After=basic.target tizen-boot.target rescue.service rescue.target +Before=multi-user.target diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec index 15eb194..7f66989 100644 --- a/packaging/system-plugin-emulator.spec +++ b/packaging/system-plugin-emulator.spec @@ -1,5 +1,5 @@ Name: system-plugin-emulator -Version: 0.1.2 +Version: 0.1.3 Release: 1 %define systemd_dir /usr/lib/systemd @@ -14,6 +14,7 @@ Requires(post): setup Requires(post): coreutils Source0: %{name}-%{version}.tar.gz Source1001: packaging/%{name}.manifest +ExclusiveArch: %{ix86} %description System plugin files for emulator @@ -47,8 +48,10 @@ ln -s %{systemd_dir}/system/dev-vdb.swap %{buildroot}/%{systemd_dir}/system/emul # for emulator.target mkdir -p %{buildroot}/%{systemd_dir}/system/multi-user.target.wants ln -s %{systemd_dir}/system/emulator.target %{buildroot}/%{systemd_dir}/system/multi-user.target.wants/ +ln -s %{systemd_dir}/system/tizen-boot.target %{buildroot}/%{systemd_dir}/system/multi-user.target.wants/ +ln -s %{systemd_dir}/system/tizen-system.target %{buildroot}/%{systemd_dir}/system/multi-user.target.wants/ +ln -s %{systemd_dir}/system/tizen-runtime.target %{buildroot}/%{systemd_dir}/system/multi-user.target.wants/ mkdir -p %{buildroot}/%{systemd_dir}/system/emulator.target.wants - # services from system-plugin-exynos ln -s ../tizen-generate-env.service %{buildroot}/%{systemd_dir}/system/basic.target.wants/ mkdir -p %{buildroot}/%{systemd_dir}/system/default.target.wants @@ -89,6 +92,9 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} /usr/lib/systemd/system/default.target.wants/tizen-readahead-collect.service /usr/lib/systemd/system/default.target.wants/tizen-readahead-replay.service /usr/lib/systemd/system/multi-user.target.wants/emulator.target +/usr/lib/systemd/system/multi-user.target.wants/tizen-boot.target +/usr/lib/systemd/system/multi-user.target.wants/tizen-system.target +/usr/lib/systemd/system/multi-user.target.wants/tizen-runtime.target /usr/lib/systemd/system/emul-setup-audio-volume.service /usr/lib/systemd/system/emul-mount-hostdir.service /usr/lib/systemd/system/emul-common-preinit.service @@ -97,6 +103,9 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} /usr/lib/systemd/system/emulator_preinit.target.wants/emul-mount-hostdir.service /usr/lib/systemd/system/emulator_preinit.target.wants/emul-common-preinit.service /usr/lib/systemd/system/emulator_preinit.target.wants/dev-vdb.swap +/usr/lib/systemd/system/tizen-boot.target +/usr/lib/systemd/system/tizen-system.target +/usr/lib/systemd/system/tizen-runtime.target /usr/lib/systemd/system/tizen-boot.target.wants/wm_ready.service /usr/lib/systemd/system/tizen-readahead-collect.service /usr/lib/systemd/system/tizen-readahead-replay.service