<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10894">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Install systemd services with autotools<br><br>Change-Id: I103bf3468d53578045593eac31b61f7e0248495e<br>---<br>M Makefile.am<br>M configure.ac<br>A contrib/Makefile.am<br>A contrib/systemd/Makefile.am<br>M debian/osmo-gbproxy.install<br>D debian/osmo-gbproxy.service<br>M debian/osmo-gtphub.install<br>D debian/osmo-gtphub.service<br>M debian/osmo-sgsn.install<br>D debian/osmo-sgsn.service<br>M debian/rules<br>11 files changed, 37 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/94/10894/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.am b/Makefile.am</span><br><span>index 38fdcba..1883ab5 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -12,6 +12,7 @@</span><br><span>         doc \</span><br><span>        include \</span><br><span>    src \</span><br><span style="color: hsl(120, 100%, 40%);">+ contrib \</span><br><span>    tests \</span><br><span>      $(NULL)</span><br><span> </span><br><span>@@ -21,6 +22,9 @@</span><br><span> BUILT_SOURCES = $(top_srcdir)/.version</span><br><span> EXTRA_DIST = git-version-gen osmoappdesc.py .version</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DISTCHECK_CONFIGURE_FLAGS = \</span><br><span style="color: hsl(120, 100%, 40%);">+  --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> @RELMAKE@</span><br><span> </span><br><span> $(top_srcdir)/.version:</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index c233fa3..73b6dce 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -176,6 +176,22 @@</span><br><span> AC_MSG_RESULT([$enable_ext_tests])</span><br><span> AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# https://www.freedesktop.org/software/systemd/man/daemon.html</span><br><span style="color: hsl(120, 100%, 40%);">+AC_ARG_WITH([systemdsystemunitdir],</span><br><span style="color: hsl(120, 100%, 40%);">+     [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,</span><br><span style="color: hsl(120, 100%, 40%);">+     [with_systemdsystemunitdir=auto])</span><br><span style="color: hsl(120, 100%, 40%);">+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [</span><br><span style="color: hsl(120, 100%, 40%);">+     def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     AS_IF([test "x$def_systemdsystemunitdir" = "x"],</span><br><span style="color: hsl(120, 100%, 40%);">+   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],</span><br><span style="color: hsl(120, 100%, 40%);">+    [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])</span><br><span style="color: hsl(120, 100%, 40%);">+    with_systemdsystemunitdir=no],</span><br><span style="color: hsl(120, 100%, 40%);">+   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])</span><br><span style="color: hsl(120, 100%, 40%);">+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],</span><br><span style="color: hsl(120, 100%, 40%);">+      [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> AC_MSG_RESULT([CFLAGS="$CFLAGS"])</span><br><span> AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])</span><br><span> </span><br><span>@@ -201,4 +217,6 @@</span><br><span>     tests/v42bis/Makefile</span><br><span>     doc/Makefile</span><br><span>     doc/examples/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+    contrib/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+    contrib/systemd/Makefile</span><br><span>     Makefile)</span><br><span>diff --git a/contrib/Makefile.am b/contrib/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..3439c97</span><br><span>--- /dev/null</span><br><span>+++ b/contrib/Makefile.am</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = systemd</span><br><span>diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..b644f34</span><br><span>--- /dev/null</span><br><span>+++ b/contrib/systemd/Makefile.am</span><br><span>@@ -0,0 +1,9 @@</span><br><span style="color: hsl(120, 100%, 40%);">+if HAVE_SYSTEMD</span><br><span style="color: hsl(120, 100%, 40%);">+SYSTEMD_SERVICES = \</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo-gbproxy.service \</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo-gtphub.service \</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo-sgsn.service</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+EXTRA_DIST = $(SYSTEMD_SERVICES)</span><br><span style="color: hsl(120, 100%, 40%);">+systemdsystemunit_DATA = $(SYSTEMD_SERVICES)</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span>diff --git a/debian/osmo-gbproxy.install b/debian/osmo-gbproxy.install</span><br><span>index 8272551..9c7fb77 100644</span><br><span>--- a/debian/osmo-gbproxy.install</span><br><span>+++ b/debian/osmo-gbproxy.install</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+lib/systemd/system/osmo-gbproxy.service</span><br><span> usr/bin/osmo-gbproxy</span><br><span> usr/share/doc/osmo-sgsn/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg usr/share/doc/osmo-gbproxy/examples</span><br><span> usr/share/doc/osmo-sgsn/examples/osmo-gbproxy/osmo-gbproxy.cfg usr/share/doc/osmo-gbproxy/examples</span><br><span>diff --git a/debian/osmo-gbproxy.service b/debian/osmo-gbproxy.service</span><br><span>deleted file mode 120000</span><br><span>index d23c649..0000000</span><br><span>--- a/debian/osmo-gbproxy.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../contrib/systemd/osmo-gbproxy.service</span><br><span>\ No newline at end of file</span><br><span>diff --git a/debian/osmo-gtphub.install b/debian/osmo-gtphub.install</span><br><span>index ed0bd1b..568caaf 100644</span><br><span>--- a/debian/osmo-gtphub.install</span><br><span>+++ b/debian/osmo-gtphub.install</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+lib/systemd/system/osmo-gtphub.service</span><br><span> usr/bin/osmo-gtphub</span><br><span> usr/share/doc/osmo-sgsn/examples/osmo-gtphub/osmo-gtphub-1iface.cfg usr/share/doc/osmo-gtphub/examples</span><br><span> usr/share/doc/osmo-sgsn/examples/osmo-gtphub/osmo-gtphub.cfg usr/share/doc/osmo-gtphub/examples</span><br><span>diff --git a/debian/osmo-gtphub.service b/debian/osmo-gtphub.service</span><br><span>deleted file mode 120000</span><br><span>index 81a0eb4..0000000</span><br><span>--- a/debian/osmo-gtphub.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../contrib/systemd/osmo-gtphub.service</span><br><span>\ No newline at end of file</span><br><span>diff --git a/debian/osmo-sgsn.install b/debian/osmo-sgsn.install</span><br><span>index 9390deb..9d603f9 100644</span><br><span>--- a/debian/osmo-sgsn.install</span><br><span>+++ b/debian/osmo-sgsn.install</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+lib/systemd/system/osmo-sgsn.service</span><br><span> usr/bin/osmo-sgsn</span><br><span> usr/share/doc/osmo-sgsn/examples/osmo-sgsn/osmo-sgsn.cfg usr/share/doc/osmo-sgsn/examples</span><br><span> usr/share/doc/osmo-sgsn/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg usr/share/doc/osmo-sgsn/examples</span><br><span>diff --git a/debian/osmo-sgsn.service b/debian/osmo-sgsn.service</span><br><span>deleted file mode 120000</span><br><span>index de22d90..0000000</span><br><span>--- a/debian/osmo-sgsn.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../contrib/systemd/osmo-sgsn.service</span><br><span>\ No newline at end of file</span><br><span>diff --git a/debian/rules b/debian/rules</span><br><span>index 58ea9bb..e4b3d80 100755</span><br><span>--- a/debian/rules</span><br><span>+++ b/debian/rules</span><br><span>@@ -42,11 +42,11 @@</span><br><span> </span><br><span> # main packaging script based on dh7 syntax</span><br><span> %:</span><br><span style="color: hsl(0, 100%, 40%);">-    dh $@ --with autoreconf </span><br><span style="color: hsl(120, 100%, 40%);">+      dh $@ --with autoreconf</span><br><span> </span><br><span> # debmake generated override targets</span><br><span> # Set options for ./configure</span><br><span style="color: hsl(0, 100%, 40%);">-CONFIGURE_FLAGS += --enable-iu</span><br><span style="color: hsl(120, 100%, 40%);">+CONFIGURE_FLAGS += --enable-iu --with-systemdsystemunitdir=/lib/systemd/system</span><br><span> override_dh_configure:</span><br><span>         dh_auto_configure -- $(CONFIGURE_FLAGS)</span><br><span> #</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10894">change 10894</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10894"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I103bf3468d53578045593eac31b61f7e0248495e </div>
<div style="display:none"> Gerrit-Change-Number: 10894 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>