From 8d06c252478c4e556ebdc51a806d10990b43da1a Mon Sep 17 00:00:00 2001 From: Taeyoung Kim Date: Tue, 8 Mar 2016 17:14:28 +0900 Subject: [PATCH] remove duplicated service file - tizen-system-env.service is installed by system-plugin which is the common plugin. Thus emulator plugin should not have the file. Change-Id: Id7db2f7819e4463024f5ac69c3fe7676c9d0d7fa Signed-off-by: Taeyoung Kim --- .../usr/lib/systemd/system/tizen-system-env.service | 13 ------------- packaging/system-plugin-emulator.spec | 3 --- 2 files changed, 16 deletions(-) delete mode 100644 filesystem/usr/lib/systemd/system/tizen-system-env.service diff --git a/filesystem/usr/lib/systemd/system/tizen-system-env.service b/filesystem/usr/lib/systemd/system/tizen-system-env.service deleted file mode 100644 index 2ffaf12..0000000 --- a/filesystem/usr/lib/systemd/system/tizen-system-env.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Generate environment from /etc/profile.d -DefaultDependencies=no -After=opt.mount -Before=basic.target - -[Service] -Type=oneshot -ExecStart=/usr/bin/env -i sh -c 'source /etc/profile; env | /bin/egrep -v "^(HOME|PWD|SHLVL|_|USER|MAIL|LOGNAME|XDG_RUNTIME_DIR)=" > /run/tizen-system-env' -ExecStart=/usr/bin/env -i sh -c 'source /etc/profile; env | /bin/egrep -e "XDG_RUNTIME_DIR=" > /run/xdg-root-env' - -[Install] -WantedBy=basic.target diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec index 627d87b..8356995 100644 --- a/packaging/system-plugin-emulator.spec +++ b/packaging/system-plugin-emulator.spec @@ -33,7 +33,6 @@ cp -arf filesystem/* %{buildroot} %install_service emulator_preinit.target.wants emul-common-preinit.service %install_service emulator_preinit.target.wants dev-disk-by\\x2dlabel-emulator\\x2dswap.swap %install_service multi-user.target.wants emulator.target -%install_service basic.target.wants tizen-system-env.service # include license mkdir -p %{buildroot}/usr/share/license @@ -57,7 +56,6 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} %{_unitdir}/emulator_preinit.target %{_unitdir}/emulator.target %{_unitdir}/basic.target.wants/emulator_preinit.target -%{_unitdir}/basic.target.wants/tizen-system-env.service %{_unitdir}/multi-user.target.wants/emulator.target %{_unitdir}/emul-setup-audio-volume.service %{_unitdir}/emul-common-preinit.service @@ -65,7 +63,6 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} %{_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-disk-by\x2dlabel-emulator\x2dswap.swap -%{_unitdir}/tizen-system-env.service %{_prefix}/lib/udev/rules.d/51-tizen-udev-default.rules %{_prefix}/lib/udev/rules.d/95-tizen-emulator.rules /usr/share/license/%{name} -- 2.34.1