From 923755c1486eec4cfbc62a1245ce239de9d366c6 Mon Sep 17 00:00:00 2001 From: Sangjung Woo Date: Thu, 1 Oct 2015 11:58:51 +0900 Subject: [PATCH] spec: cleanup the spec and systemd unit files * Remove unused systemd unit file such as tizen-boot.target, wm_ready.service, tizen-system.target, tizen-runtime.target * Remove tizen-readahead functionality since that does not used in v3.0 * Use "%install_service" directive instead of primitive command such as cp and ln * Remove unused macros Change-Id: I4c3f695446e30023528f75227ff627f53669c2e3 Signed-off-by: Sangjung Woo --- .../usr/lib/systemd/system/tizen-boot.target | 6 -- .../system/tizen-readahead-collect.service | 17 ----- .../system/tizen-readahead-replay.service | 16 ----- .../lib/systemd/system/tizen-runtime.target | 6 -- .../lib/systemd/system/tizen-system.target | 6 -- .../usr/lib/systemd/system/wm_ready.service | 12 ---- packaging/system-plugin-emulator.spec | 69 +++++-------------- 7 files changed, 19 insertions(+), 113 deletions(-) delete mode 100644 filesystem/usr/lib/systemd/system/tizen-boot.target delete mode 100644 filesystem/usr/lib/systemd/system/tizen-readahead-collect.service delete mode 100644 filesystem/usr/lib/systemd/system/tizen-readahead-replay.service delete mode 100644 filesystem/usr/lib/systemd/system/tizen-runtime.target delete mode 100644 filesystem/usr/lib/systemd/system/tizen-system.target delete mode 100644 filesystem/usr/lib/systemd/system/wm_ready.service diff --git a/filesystem/usr/lib/systemd/system/tizen-boot.target b/filesystem/usr/lib/systemd/system/tizen-boot.target deleted file mode 100644 index 1533be5..0000000 --- a/filesystem/usr/lib/systemd/system/tizen-boot.target +++ /dev/null @@ -1,6 +0,0 @@ -[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-readahead-collect.service b/filesystem/usr/lib/systemd/system/tizen-readahead-collect.service deleted file mode 100644 index dc37903..0000000 --- a/filesystem/usr/lib/systemd/system/tizen-readahead-collect.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Collect Read-Ahead Data -DefaultDependencies=no -Conflicts=shutdown.target -After=smack.service smack_pre_labeling_priv.service -Before=sysinit.target shutdown.target -ConditionPathExists=/opt/etc/.vconf_labeling -ConditionPathExists=!/opt/.readahead - -[Service] -Type=notify -ExecStart=/usr/lib/systemd/systemd-readahead collect --timeout=6s --savedir=/opt -RemainAfterExit=yes -StandardOutput=null - -[Install] -WantedBy=default.target diff --git a/filesystem/usr/lib/systemd/system/tizen-readahead-replay.service b/filesystem/usr/lib/systemd/system/tizen-readahead-replay.service deleted file mode 100644 index 4ec17be..0000000 --- a/filesystem/usr/lib/systemd/system/tizen-readahead-replay.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Replay Read-Ahead Data -DefaultDependencies=no -Conflicts=shutdown.target -After=smack.service smack_pre_labeling_priv.service -Before=sysinit.target shutdown.target -ConditionPathExists=/opt/.readahead - -[Service] -Type=notify -ExecStart=/usr/lib/systemd/systemd-readahead replay --savedir=/opt -RemainAfterExit=yes -StandardOutput=null - -[Install] -WantedBy=default.target diff --git a/filesystem/usr/lib/systemd/system/tizen-runtime.target b/filesystem/usr/lib/systemd/system/tizen-runtime.target deleted file mode 100644 index b1bc216..0000000 --- a/filesystem/usr/lib/systemd/system/tizen-runtime.target +++ /dev/null @@ -1,6 +0,0 @@ -[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 deleted file mode 100644 index 4240819..0000000 --- a/filesystem/usr/lib/systemd/system/tizen-system.target +++ /dev/null @@ -1,6 +0,0 @@ -[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/filesystem/usr/lib/systemd/system/wm_ready.service b/filesystem/usr/lib/systemd/system/wm_ready.service deleted file mode 100644 index 00d287f..0000000 --- a/filesystem/usr/lib/systemd/system/wm_ready.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=waiting for window mananger -After=xorg.service -Before=tizen-boot.target - -[Service] -Type=oneshot -ExecStart=/bin/sh -c 'while [ ! -e /tmp/.wm_ready ]; do sleep 0.1 ; done' -TimeoutSec=30s - -[Install] -WantedBy=tizen-boot.target diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec index c3bd5b9..6061cbc 100644 --- a/packaging/system-plugin-emulator.spec +++ b/packaging/system-plugin-emulator.spec @@ -1,9 +1,6 @@ Name: system-plugin-emulator Version: 0.1.7 Release: 1 - -%define systemd_dir /usr/lib/systemd - Summary: System plugin for emulator License: Apache-2.0 Group: System/Configuration @@ -29,29 +26,13 @@ System plugin files for emulator find . -name .gitignore -exec rm -f {} \; cp -arf filesystem/* %{buildroot} -# for systemd -# for emulator_preinit.target -mkdir -p %{buildroot}/%{systemd_dir}/system/basic.target.wants -ln -s %{systemd_dir}/system/emulator_preinit.target %{buildroot}/%{systemd_dir}/system/basic.target.wants/ -mkdir -p %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants -ln -s %{systemd_dir}/system/emul-setup-audio-volume.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/ -ln -s %{systemd_dir}/system/emul-common-preinit.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/ -ln -s %{systemd_dir}/system/dev-vdb.swap %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/ -# 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 -ln -s ../tizen-readahead-collect.service %{buildroot}/%{systemd_dir}/system/default.target.wants/ -ln -s ../tizen-readahead-replay.service %{buildroot}/%{systemd_dir}/system/default.target.wants/ -mkdir -p %{buildroot}/%{systemd_dir}/system/tizen-boot.target.wants -ln -s ../wm_ready.service %{buildroot}/%{systemd_dir}/system/tizen-boot.target.wants/ -mkdir -p %{buildroot}/%{systemd_dir}/system/tizen-system.target.wants +# for systemd unit +%install_service basic.target.wants emulator_preinit.target +%install_service emulator_preinit.target.wants emul-setup-audio-volume.service +%install_service emulator_preinit.target.wants emul-common-preinit.service +%install_service emulator_preinit.target.wants dev-vdb.swap +%install_service multi-user.target.wants emulator.target +%install_service basic.target.wants tizen-generate-env.service # include license mkdir -p %{buildroot}/usr/share/license @@ -72,30 +53,18 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} /etc/rc.d/rc.firstboot /etc/rc.d/rc.shutdown /etc/rc.d/rc.sysinit -%{systemd_dir}/system/emulator_preinit.target -%{systemd_dir}/system/emulator.target -%{systemd_dir}/system/basic.target.wants/emulator_preinit.target -%{systemd_dir}/system/basic.target.wants/tizen-generate-env.service -%{systemd_dir}/system/default.target.wants/tizen-readahead-collect.service -%{systemd_dir}/system/default.target.wants/tizen-readahead-replay.service -%{systemd_dir}/system/multi-user.target.wants/emulator.target -%{systemd_dir}/system/multi-user.target.wants/tizen-boot.target -%{systemd_dir}/system/multi-user.target.wants/tizen-system.target -%{systemd_dir}/system/multi-user.target.wants/tizen-runtime.target -%{systemd_dir}/system/emul-setup-audio-volume.service -%{systemd_dir}/system/emul-common-preinit.service -%{systemd_dir}/system/dev-vdb.swap -%{systemd_dir}/system/emulator_preinit.target.wants/emul-setup-audio-volume.service -%{systemd_dir}/system/emulator_preinit.target.wants/emul-common-preinit.service -%{systemd_dir}/system/emulator_preinit.target.wants/dev-vdb.swap -%{systemd_dir}/system/tizen-boot.target -%{systemd_dir}/system/tizen-system.target -%{systemd_dir}/system/tizen-runtime.target -%{systemd_dir}/system/tizen-boot.target.wants/wm_ready.service -%{systemd_dir}/system/tizen-readahead-collect.service -%{systemd_dir}/system/tizen-readahead-replay.service -%{systemd_dir}/system/wm_ready.service -%{systemd_dir}/system/tizen-generate-env.service +%{_unitdir}/emulator_preinit.target +%{_unitdir}/emulator.target +%{_unitdir}/basic.target.wants/emulator_preinit.target +%{_unitdir}/basic.target.wants/tizen-generate-env.service +%{_unitdir}/multi-user.target.wants/emulator.target +%{_unitdir}/emul-setup-audio-volume.service +%{_unitdir}/emul-common-preinit.service +%{_unitdir}/dev-vdb.swap +%{_unitdir}/emulator_preinit.target.wants/emul-setup-audio-volume.service +%{_unitdir}/emulator_preinit.target.wants/emul-common-preinit.service +%{_unitdir}/emulator_preinit.target.wants/dev-vdb.swap +%{_unitdir}/tizen-generate-env.service %{_libdir}/udev/rules.d/51-tizen-udev-default.rules %{_libdir}/udev/rules.d/95-tizen-emulator.rules /usr/share/license/%{name} -- 2.34.1