From 62dd2c9400f7d9f35a03e7aae13eb922b4c6f3ef Mon Sep 17 00:00:00 2001 From: Kitae Kim Date: Fri, 11 Oct 2013 22:24:01 +0900 Subject: [PATCH] remove sdbd.service since sdbd package has included the service file. Conflicts: packaging/system-plugin-emulator.changes packaging/system-plugin-emulator.spec Change-Id: Iccd9061aa260117fe3644ec4eaa0dea1f8d2f8ab Signed-off-by: Kitae Kim --- filesystem/usr/lib/systemd/system/sdbd.service | 14 -------------- packaging/system-plugin-emulator.changes | 3 +++ packaging/system-plugin-emulator.spec | 3 --- 3 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 filesystem/usr/lib/systemd/system/sdbd.service diff --git a/filesystem/usr/lib/systemd/system/sdbd.service b/filesystem/usr/lib/systemd/system/sdbd.service deleted file mode 100644 index 0432676..0000000 --- a/filesystem/usr/lib/systemd/system/sdbd.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=sdbd -Before=sensord.service - -[Service] -Type=forking -Environment=DISPLAY=:0 -PIDFile=/tmp/.sdbd.pid -RemainAfterExit=yes -ExecStartPre=/bin/bash -c "/bin/echo `/bin/sed 's/^.*sdb_port=\([^, ]*\).*$/\1/g' /proc/cmdline` > /opt/home/sdb_port.txt" -ExecStart=/usr/sbin/sdbd - -[Install] -WantedBy=emulator.target diff --git a/packaging/system-plugin-emulator.changes b/packaging/system-plugin-emulator.changes index 57c8c92..68d7adf 100644 --- a/packaging/system-plugin-emulator.changes +++ b/packaging/system-plugin-emulator.changes @@ -1,6 +1,9 @@ * Fri Nov 1 06:19:37 UTC 2013 GiWoong Kim - modified model-config.sh +* Fri Oct 11 13:14:14 UTC 2013 Kitae Kim +- remove sdbd.service since sdbd package has included the service file. + * Fri Oct 11 10:18:17 UTC 2013 GiWoong Kim - Merge rc.shutdown 'system-plugin-slp' into emulator diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec index ae52c64..6fccdbd 100644 --- a/packaging/system-plugin-emulator.spec +++ b/packaging/system-plugin-emulator.spec @@ -48,7 +48,6 @@ ln -s %{systemd_dir}/system/emul-common-preinit.service %{buildroot}/%{systemd_d 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/ mkdir -p %{buildroot}/%{systemd_dir}/system/emulator.target.wants -ln -s %{systemd_dir}/system/sdbd.service %{buildroot}/%{systemd_dir}/system/emulator.target.wants/ ln -s %{systemd_dir}/system/sshd.service %{buildroot}/%{systemd_dir}/system/emulator.target.wants/ # for host file sharing @@ -93,9 +92,7 @@ fi /usr/lib/systemd/system/emulator_preinit.target.wants/emul-setup-audio-volume.service /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/sdbd.service /usr/lib/systemd/system/sshd.service -/usr/lib/systemd/system/emulator.target.wants/sdbd.service /usr/lib/systemd/system/emulator.target.wants/sshd.service /usr/lib/udev/rules.d/95-tizen-emulator.rules %dir /mnt/host -- 2.34.1