Skip to contentSkip to conversation

Add dbus .service file to auto start ofonod

PATCH In review Shane Bryan 2 participants 3 messages May 22, 2009 – May 26, 2009

lore
Share & tools
lore

Shane Bryan

author
#0 lore raw

PATCH 1/1 Add dbus .service file to auto start ofonod

Signed-off-by Shane Bryan <[email protected]>
---
 configure.ac          |    4 ++++
 src/Makefile.am       |    4 +++-
 src/org.ofono.service |    4 ++++
 3 files changed, 11 insertions(+), 1 deletions(-)
 create mode 100644 src/org.ofono.service
configure.ac +4 -0
index 36fec5f..0b452dd 100644
@@ -73,6 +73,10 @@ else
 fi
 AC_SUBST(DBUS_DATADIR)
 
+DBUS_SYSTEM_SERVICEDIR="${datadir}/dbus-1/system-services"
+AC_SUBST(DBUS_SYSTEM_SERVICEDIR)
+
+
 AC_SUBST([GDBUS_CFLAGS], ['$(DBUS_CFLAGS) -I$(top_srcdir)/gdbus'])
 AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la $(DBUS_LIBS)'])
src/Makefile.am +3 -1
index 38c97bd..0c618b8 100644
@@ -1,8 +1,10 @@
 
 if DATAFILES
 dbusdir = @DBUS_DATADIR@
+servicedir = @DBUS_SYSTEM_SERVICEDIR@
 
 dbus_DATA = ofono.conf
+service_DATA = org.ofono.service
 endif
 
 sbin_PROGRAMS = ofonod

@@ -35,7 +37,7 @@ AM_CFLAGS = @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ @GATCHAT_CFLAGS@ \
 
 INCLUDES = -I$(top_builddir)/include -I$(top_builddir)
 
-EXTRA_DIST = ofono.conf
+EXTRA_DIST = ofono.conf org.ofono.service
 
 MAINTAINERCLEANFILES = Makefile.in
src/org.ofono.service new file +4 -0
new file mode 100644
index 0000000..b98b109
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.ofono
+Exec=/usr/sbin/ofonod
+User=root
Signature · 1 line
1.6.0.4
#1 lore raw

Hi Shane,

Quoted 5 lines
Signed-off-by Shane Bryan <[email protected]>
---
 configure.ac          |    4 ++++
 src/Makefile.am       |    4 +++-
 src/org.ofono.service |    4 ++++

actually it would be better if we just do ofono.service.in (drop the org in front of it) and then let autoconf fixup the actually configured prefix.

Regards

Marcel

author
#2 lore raw
Quoted 4 lines · On Sat, 23 May 2009 13:35:11 +0200 marcel at holtmann.org (Marcel Holtmann)…

actually it would be better if we just do ofono.service.in (drop the org in front of it) and then let autoconf fixup the actually configured prefix.

Ok, new patch attached, this time taking ofono.service.in and generating org.ofono.service by autoconf/automake rules that define the .service file name as well as the "Name" and "Exec" values in the generated file

Shane...

From ce040278b6f2f58a97f69e0c67e4339f0e67f398 Mon Sep 17 00:00:00 2001
From: Shane Bryan <[email protected]>
Date: Tue, 26 May 2009 14:22:41 -0700
Subject: [PATCH] Install auto generated dbus system-service file

Signed-off-by Shane Bryan <[email protected]>
---
 configure.ac         |    9 +++++++++
 src/Makefile.am      |   16 ++++++++++++++--
 src/ofono.service.in |    4 ++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 src/ofono.service.in
configure.ac +9 -0
index 36fec5f..023f2ab 100644
@@ -73,6 +73,15 @@ else
 fi
 AC_SUBST(DBUS_DATADIR)
 
+DBUS_SYSTEM_SERVICEDIR="${datadir}/dbus-1/system-services"
+AC_SUBST(DBUS_SYSTEM_SERVICEDIR)
+
+DBUS_SERVICE_PREFIX="org"
+AC_SUBST(DBUS_SERVICE_PREFIX)
+
+DBUS_SERVICE_NAME="$DBUS_SERVICE_PREFIX.$PACKAGE"
+AC_SUBST(DBUS_SERVICE_NAME)
+
 AC_SUBST([GDBUS_CFLAGS], ['$(DBUS_CFLAGS) -I$(top_srcdir)/gdbus'])
 AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la $(DBUS_LIBS)'])
src/Makefile.am +14 -2
index 38c97bd..b6688bd 100644
@@ -3,6 +3,18 @@ if DATAFILES
 dbusdir = @DBUS_DATADIR@
 
 dbus_DATA = ofono.conf
+
+servicedir = @DBUS_SYSTEM_SERVICEDIR@
+service_in_files = ofono.service.in
+service_DATA = @DBUS_SERVICE_NAME(a).service
+
+$(service_DATA): $(service_in_files) Makefile
+	$(edit) $< >$@
+
+edit = sed \
+	-e 's|@sbindir[@]|$(sbindir)|g' \
+	-e 's|@sbin_PROGRAMS[@]|$(sbin_PROGRAMS)|g' \
+	-e 's|@DBUS_SERVICE_NAME[@]|$(DBUS_SERVICE_NAME)|g'
 endif
 
 sbin_PROGRAMS = ofonod

@@ -22,7 +34,7 @@ ofonod_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=ofono.ver
 
 ofonod_DEPENDENCIES = ofono.ver
 
-CLEANFILES = ofono.ver ofono.exp
+CLEANFILES = ofono.ver ofono.exp $(service_DATA)
 
 if MAINTAINER_MODE
 plugindir = $(abs_top_srcdir)/plugins/.libs

@@ -35,7 +47,7 @@ AM_CFLAGS = @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ @GATCHAT_CFLAGS@ \
 
 INCLUDES = -I$(top_builddir)/include -I$(top_builddir)
 
-EXTRA_DIST = ofono.conf
+EXTRA_DIST = $(dbus_DATA) $(service_DATA) $(service_in_files)
 
 MAINTAINERCLEANFILES = Makefile.in
src/ofono.service.in new file +4 -0
new file mode 100644
index 0000000..16c9bd6
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=@DBUS_SERVICE_NAME@
+Exec=@sbindir@/@sbin_PROGRAMS@
+User=root
Signature · 1 line
1.6.0.4
Quoted 1 line

From ce040278b6f2f58a97f69e0c67e4339f0e67f398 Mon Sep 17 00:00:00 2001

From: Shane Bryan <[email protected]>
Date: Tue, 26 May 2009 14:22:41 -0700
Subject: [PATCH] Install auto generated dbus system-service file

Signed-off-by Shane Bryan <[email protected]>
---
 configure.ac         |    9 +++++++++
 src/Makefile.am      |   16 ++++++++++++++--
 src/ofono.service.in |    4 ++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 src/ofono.service.in
configure.ac +9 -0
index 36fec5f..023f2ab 100644
@@ -73,6 +73,15 @@ else
 fi
 AC_SUBST(DBUS_DATADIR)
 
+DBUS_SYSTEM_SERVICEDIR="${datadir}/dbus-1/system-services"
+AC_SUBST(DBUS_SYSTEM_SERVICEDIR)
+
+DBUS_SERVICE_PREFIX="org"
+AC_SUBST(DBUS_SERVICE_PREFIX)
+
+DBUS_SERVICE_NAME="$DBUS_SERVICE_PREFIX.$PACKAGE"
+AC_SUBST(DBUS_SERVICE_NAME)
+
 AC_SUBST([GDBUS_CFLAGS], ['$(DBUS_CFLAGS) -I$(top_srcdir)/gdbus'])
 AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la $(DBUS_LIBS)'])
src/Makefile.am +14 -2
index 38c97bd..b6688bd 100644
@@ -3,6 +3,18 @@ if DATAFILES
 dbusdir = @DBUS_DATADIR@
 
 dbus_DATA = ofono.conf
+
+servicedir = @DBUS_SYSTEM_SERVICEDIR@
+service_in_files = ofono.service.in
+service_DATA = @[email protected]
+
+$(service_DATA): $(service_in_files) Makefile
+	$(edit) $< >$@
+
+edit = sed \
+	-e 's|@sbindir[@]|$(sbindir)|g' \
+	-e 's|@sbin_PROGRAMS[@]|$(sbin_PROGRAMS)|g' \
+	-e 's|@DBUS_SERVICE_NAME[@]|$(DBUS_SERVICE_NAME)|g'
 endif
 
 sbin_PROGRAMS = ofonod

@@ -22,7 +34,7 @@ ofonod_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=ofono.ver
 
 ofonod_DEPENDENCIES = ofono.ver
 
-CLEANFILES = ofono.ver ofono.exp
+CLEANFILES = ofono.ver ofono.exp $(service_DATA)
 
 if MAINTAINER_MODE
 plugindir = $(abs_top_srcdir)/plugins/.libs

@@ -35,7 +47,7 @@ AM_CFLAGS = @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ @GATCHAT_CFLAGS@ \
 
 INCLUDES = -I$(top_builddir)/include -I$(top_builddir)
 
-EXTRA_DIST = ofono.conf
+EXTRA_DIST = $(dbus_DATA) $(service_DATA) $(service_in_files)
 
 MAINTAINERCLEANFILES = Makefile.in
src/ofono.service.in new file +4 -0
new file mode 100644
index 0000000..16c9bd6
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=@DBUS_SERVICE_NAME@
+Exec=@sbindir@/@sbin_PROGRAMS@
+User=root
Signature · 1 line
1.6.0.4