<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10893">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Pau Espin Pedrol: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Install systemd services with autotools<br><br>Change-Id: I563559f5b501eded44efafc60bb0c9ffdea20b3e<br>---<br>M Makefile.am<br>M configure.ac<br>A contrib/Makefile.am<br>A contrib/systemd/Makefile.am<br>R contrib/systemd/osmo-ggsn.service<br>M debian/osmo-ggsn.install<br>D debian/osmo-ggsn.service<br>M debian/rules<br>8 files changed, 35 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.am b/Makefile.am</span><br><span>index f9849c0..be378be 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -1,5 +1,5 @@</span><br><span> ## Process this file with automake to produce Makefile.in</span><br><span style="color: hsl(0, 100%, 40%);">-SUBDIRS = lib gtp ggsn sgsnemu doc tests</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = lib gtp ggsn sgsnemu doc contrib tests</span><br><span> </span><br><span> pkgconfigdir = $(libdir)/pkgconfig</span><br><span> pkgconfig_DATA = libgtp.pc</span><br><span>@@ -12,4 +12,7 @@</span><br><span> </span><br><span> EXTRA_DIST = git-version-gen .version README.md README.FreeBSD README.MacOSX</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>diff --git a/configure.ac b/configure.ac</span><br><span>index 62812ae..bfa1364 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -38,9 +38,9 @@</span><br><span> </span><br><span> </span><br><span> case "${host}" in</span><br><span style="color: hsl(0, 100%, 40%);">- i*86-*-linux-gnu*) </span><br><span style="color: hsl(120, 100%, 40%);">+ i*86-*-linux-gnu*)</span><br><span> EXEC_LDADD="" ;;</span><br><span style="color: hsl(0, 100%, 40%);">- *solaris*) </span><br><span style="color: hsl(120, 100%, 40%);">+ *solaris*)</span><br><span> EXEC_LDADD="-lresolv -lsocket -lnsl" ;;</span><br><span> esac</span><br><span> </span><br><span>@@ -126,7 +126,7 @@</span><br><span> # Checks for library functions.</span><br><span> AC_PROG_GCC_TRADITIONAL</span><br><span> # AC_FUNC_MALLOC</span><br><span style="color: hsl(0, 100%, 40%);">-# AC_FUNC_MEMCMP </span><br><span style="color: hsl(120, 100%, 40%);">+# AC_FUNC_MEMCMP</span><br><span> AC_CHECK_FUNCS([gethostbyname inet_ntoa memset select socket strdup strerror strtol])</span><br><span> AC_CHECK_FUNCS(inet_aton inet_addr, break)</span><br><span> </span><br><span>@@ -169,6 +169,22 @@</span><br><span> CPPFLAGS="$CPPFLAGS $WERROR_FLAGS"</span><br><span> fi</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>@@ -181,6 +197,8 @@</span><br><span> intl/Makefile</span><br><span> po/Makefile</span><br><span> sgsnemu/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> tests/Makefile</span><br><span> tests/lib/Makefile</span><br><span> tests/gtp/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..e6ad299</span><br><span>--- /dev/null</span><br><span>+++ b/contrib/systemd/Makefile.am</span><br><span>@@ -0,0 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+if HAVE_SYSTEMD</span><br><span style="color: hsl(120, 100%, 40%);">+EXTRA_DIST = osmo-ggsn.service</span><br><span style="color: hsl(120, 100%, 40%);">+systemdsystemunit_DATA = \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-ggsn.service</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span>diff --git a/contrib/osmo-ggsn.service b/contrib/systemd/osmo-ggsn.service</span><br><span>similarity index 100%</span><br><span>rename from contrib/osmo-ggsn.service</span><br><span>rename to contrib/systemd/osmo-ggsn.service</span><br><span>diff --git a/debian/osmo-ggsn.install b/debian/osmo-ggsn.install</span><br><span>index 522a3d1..17caef7 100644</span><br><span>--- a/debian/osmo-ggsn.install</span><br><span>+++ b/debian/osmo-ggsn.install</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/lib/systemd/system/osmo-ggsn.service</span><br><span> /usr/bin/osmo-ggsn</span><br><span> /usr/bin/sgsnemu</span><br><span> /usr/share/man/man8/*</span><br><span>diff --git a/debian/osmo-ggsn.service b/debian/osmo-ggsn.service</span><br><span>deleted file mode 120000</span><br><span>index 3bc7d3d..0000000</span><br><span>--- a/debian/osmo-ggsn.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../contrib/osmo-ggsn.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 5db7886..fa087ed 100755</span><br><span>--- a/debian/rules</span><br><span>+++ b/debian/rules</span><br><span>@@ -17,3 +17,6 @@</span><br><span> override_dh_strip:</span><br><span> dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg</span><br><span> dh_strip -plibgtp3 --dbg-package=libgtp-dbg</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+override_dh_auto_configure:</span><br><span style="color: hsl(120, 100%, 40%);">+ dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10893">change 10893</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/10893"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ggsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I563559f5b501eded44efafc60bb0c9ffdea20b3e </div>
<div style="display:none"> Gerrit-Change-Number: 10893 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>