diff options
| -rwxr-xr-x | oma-dm | 73 | ||||
| -rwxr-xr-x | oma-dm-agent.manifest | 3 | ||||
| -rw-r--r-- | packaging/oma-dm-agent.changes | 11 | ||||
| -rwxr-xr-x | packaging/oma-dm-agent.spec | 25 | ||||
| -rwxr-xr-x | src/agent/CMakeLists.txt | 3 |
5 files changed, 7 insertions, 108 deletions
@@ -1,73 +0,0 @@ -#!/bin/sh - -DESC="OMA DM agent daemon" -NAME=oma-dm-agent -DAEMON=/usr/bin/$NAME -SCRIPTNAME=/etc/init.d/oma-dm - -[ -x "$DAEMON" ] || exit 0 - -do_start() { - PID=`pidof $NAME` - [ -z "$PID" ] || return 1 - $DAEMON - RETVAL=$? - return "$RETVAL" -} - -do_stop() { - PID=`pidof $NAME` - if [ -n "$PID" ]; then - kill $PID - fi - return 0 -} - -prt_res() { - RETVAL=$1 - - case "$RETVAL" in - 0|1) - echo "... done." - RETVAL=0 - ;; - *) - echo "... failed!" - RETVAL=1 - ;; - esac - - return $RETVAL -} - -case "$1" in - start) - echo "Starting $DESC" "$NAME" - if [ -f /opt/data/fota/oma-dm/.oma-dm-agent-enabled ]; then - do_start - prt_res $? - else - echo "don't exist oma-dm-agent enabled file" - prt_res $? - fi - ;; - stop) - echo "Stopping $DESC" "$NAME" - do_stop - prt_res $? - ;; - restart) - echo "Stopping $DESC" "$NAME" - do_stop - prt_res $? - sleep 2 - echo "Starting $DESC" "$NAME" - do_start - prt_res $? - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2 - exit 3 - ;; -esac - diff --git a/oma-dm-agent.manifest b/oma-dm-agent.manifest index 4e81f56..cdf5b4a 100755 --- a/oma-dm-agent.manifest +++ b/oma-dm-agent.manifest @@ -36,9 +36,6 @@ <filesystem path="/opt/usr/dbspace/.omadmagent.db-journal" label="oma-dm-agent::db"/> <filesystem path="/opt/usr/dbspace/.momanager.db" label="oma-dm-agent::db"/> <filesystem path="/opt/usr/dbspace/.momanager.db-journal" label="oma-dm-agent::db"/> - <filesystem path="/etc/rc.d/rc3.d/S91oma-dm-agent" label="_" exec_label="none"/> - <filesystem path="/etc/rc.d/rc5.d/S91oma-dm-agent" label="_" exec_label="none"/> - <filesystem path="/etc/init.d/oma-dm" label="_" exec_label="none"/> <filesystem path="/usr/share/dbus-1/system-services/com.samsung.omadmagent.service" label="_"/> <filesystem path="/etc/dbus-1/system.d/com.samsung.omadmagent.service" label="_"/> </assign> diff --git a/packaging/oma-dm-agent.changes b/packaging/oma-dm-agent.changes index 7773862..631dcbf 100644 --- a/packaging/oma-dm-agent.changes +++ b/packaging/oma-dm-agent.changes @@ -1,12 +1,15 @@ -Tue Aug 13 2013 Chengwei Yang <chengwei.yang@intel.com> +* Wed Aug 21 2013 Chengwei Yang <chengwei.yang@intel.com> +- Remove sysvinit script + +* Tue Aug 13 2013 Chengwei Yang <chengwei.yang@intel.com> - Add dbus policy conf -Mon Aug 12 2013 Chengwei Yang <chengwei.yang@intel.com> +* Mon Aug 12 2013 Chengwei Yang <chengwei.yang@intel.com> - Install to system-wide dbus service directory, TDIST-295 -Mon Aug 12 2013 Chengwei Yang <chengwei.yang@intel.com> +* Mon Aug 12 2013 Chengwei Yang <chengwei.yang@intel.com> - Fix dbus service file: add "User" field -Mon Aug 12 2013 Chengwei Yang <chengwei.yang@intel.com> +* Mon Aug 12 2013 Chengwei Yang <chengwei.yang@intel.com> - Add .changes file - Fix build failure due to badness exceeds limitation diff --git a/packaging/oma-dm-agent.spec b/packaging/oma-dm-agent.spec index ba16da5..4fb979f 100755 --- a/packaging/oma-dm-agent.spec +++ b/packaging/oma-dm-agent.spec @@ -84,29 +84,9 @@ rm -rf %{buildroot} %post -if [ ! -d /etc/rc.d/rc3.d ] -then - mkdir -p /etc/rc.d/rc3.d -fi -if [ ! -d /etc/rc.d/rc5.d ] -then - mkdir -p /etc/rc.d/rc5.d -fi - -if [ ! -f /etc/rc.d/rc3.d/S91oma-dm-agent ] -then - ln -s /etc/init.d/oma-dm /etc/rc.d/rc3.d/S91oma-dm-agent -fi -if [ ! -f /etc/rc.d/rc5.d/S91oma-dm-agent ] -then - ln -s /etc/init.d/oma-dm /etc/rc.d/rc5.d/S91oma-dm-agent -fi - -#/etc/init.d/oma-dm start %preun -/etc/init.d/oma-dm stop %postun @@ -114,9 +94,6 @@ fi rm -f /tmp/agent_fw_event_omadm* rm -f /tmp/agent_fw_noti_reply_omadm* -rm -f /etc/rc.d/rc3.d/S91oma-dm-agent -rm -f /etc/rc.d/rc5.d/S91oma-dm-agent - rm -f /opt/usr/dbspace/.dm_service.db /opt/usr/dbspace/.dm_service.db-journal rm -f /opt/usr/dbspace/.omadmagent.db /opt/usr/dbspace/.omadmagent.db-journal rm -f /opt/usr/dbspace/.momanager.db /opt/usr/dbspace/.momanager.db-journal @@ -148,8 +125,6 @@ rm -rf /usr/share/oma-dm-cfg /usr/share/oma-dm-cfg/csc-setting/change_csc_value.sh /usr/share/oma-dm-cfg/imei-setting/change_imei_callnum.sh -/etc/init.d/oma-dm - %files -n dm-private-plugins %manifest dm-private-plugins.manifest %defattr(-,root,root,-) diff --git a/src/agent/CMakeLists.txt b/src/agent/CMakeLists.txt index 44d480f..3d6685b 100755 --- a/src/agent/CMakeLists.txt +++ b/src/agent/CMakeLists.txt @@ -80,6 +80,3 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/oma-dm-cfg DESTINATION /usr/share) # install oma ds dbus file INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.omadmagent.service DESTINATION /usr/share/dbus-1/system-services) INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.omadmagent.conf DESTINATION /etc/dbus-1/system.d) - -# install booting script file -INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/${PROJECT_NAME} DESTINATION /etc/init.d/) |