Patchwork Revert "gypsy: Added init script"

login
register
mail settings
Submitter eu@felipetonello.com
Date Oct. 8, 2013, 9:58 p.m.
Message ID <1381269495-25407-1-git-send-email-eu@felipetonello.com>
Download mbox | patch
Permalink /patch/59523/
State Accepted, archived
Commit ff73480f103c4507586139b1b130fa319a39f228
Headers show

Comments

eu@felipetonello.com - Oct. 8, 2013, 9:58 p.m.
From: "Felipe F. Tonello" <eu@felipetonello.com>

This reverts commit 13f540c5a98d3a64b41117db9cf554956eebafe9.

This daemon is called by dbus when I client connects to it. So it's not
necessary to have the init script. This patch would be useful if we add the
init script as a separeted package. But for now we can remove it.

Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
---
 .../gypsy/files/gypsy-initscript                   | 61 ----------------------
 meta-oe/recipes-navigation/gypsy/gypsy.inc         | 13 +----
 2 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100755 meta-oe/recipes-navigation/gypsy/files/gypsy-initscript

Patch

diff --git a/meta-oe/recipes-navigation/gypsy/files/gypsy-initscript b/meta-oe/recipes-navigation/gypsy/files/gypsy-initscript
deleted file mode 100755
index c3c94e5..0000000
--- a/meta-oe/recipes-navigation/gypsy/files/gypsy-initscript
+++ /dev/null
@@ -1,61 +0,0 @@ 
-#! /bin/sh
-#
-# based on gypsy-example-initscript in gypsy repository
-# there are some little modifications to work with OE based distros
-# []' Felipe Tonello eu@felipetonello.com
-#
-
-set -e
-
-DESC="Gypsy daemon"
-NAME="gypsy-daemon"
-DAEMON=/usr/lib/gypsy/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-USER=root
-
-# Gracefully exit if the package has been removed.
-test -x $DAEMON || exit 0
-
-#
-#	Function that starts the daemon/service.
-#
-d_start() {
-	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--user $USER --exec $DAEMON -- $DAEMON_OPTS
-}
-
-#
-#	Function that stops the daemon/service.
-#
-d_stop() {
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-		 --oknodo --user $USER --exec $DAEMON
-}
-
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: $NAME"
-	d_start
-	echo "."
-	;;
-  stop)
-	echo -n "Stopping $DESC: $NAME"
-	d_stop
-	echo "."
-	;;
-  restart|force-reload)
-	echo -n "Restarting $DESC: $NAME"
-	d_stop
-	sleep 1
-	d_start
-	echo "."
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/meta-oe/recipes-navigation/gypsy/gypsy.inc b/meta-oe/recipes-navigation/gypsy/gypsy.inc
index 1f50d79..747b61d 100644
--- a/meta-oe/recipes-navigation/gypsy/gypsy.inc
+++ b/meta-oe/recipes-navigation/gypsy/gypsy.inc
@@ -8,20 +8,13 @@  LICENSE = "GPLv2.0 & LGPLv2.1"
 SECTION = "console/network"
 DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt-native libxslt"
 
+inherit autotools pkgconfig gtk-doc
 PACKAGES += "libgypsy"
-SRC_URI = "file://gypsy-initscript"
-
-inherit autotools pkgconfig gtk-doc update-rc.d
-
-INITSCRIPT_NAME = "gypsy-daemon"
-# make sure it starts after X
-INITSCRIPT_PARAMS = "start 10 5 3 2 . stop 20 0 1 6 ."
 
 EXTRA_OECONF += "--with-distro=debian"
 
 FILES_${PN} = " \
   ${sysconfdir}/gypsy.conf \
-  ${sysconfdir}/init.d/gypsy-daemon \
   ${sysconfdir}/dbus-1 \
   ${libexecdir}/gypsy-daemon \
   ${datadir}/dbus-1 \
@@ -30,7 +23,3 @@  FILES_${PN} = " \
 FILES_libgypsy = " \
   ${libdir}/libgypsy${SOLIBS} \
 "
-
-do_install_append() {
-  install -D ${WORKDIR}/gypsy-initscript ${D}/${sysconfdir}/init.d/gypsy-daemon
-}