<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11545">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Install systemd services with autotools<br><br>Change-Id: Id938f3dab4826ac748abb5e0b169d800c2a625a5<br>---<br>M Makefile.am<br>M configure.ac<br>M contrib/Makefile.am<br>A contrib/systemd/Makefile.am<br>A contrib/systemd/osmo-pcap-client.service<br>A contrib/systemd/osmo-pcap-server.service<br>M debian/osmo-pcap-client.install<br>M debian/osmo-pcap-server.install<br>M debian/rules<br>9 files changed, 63 insertions(+), 0 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 6caa009..0f4a249 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -5,6 +5,10 @@</span><br><span> BUILT_SOURCES = $(top_srcdir)/.version</span><br><span> EXTRA_DIST = git-version-gen .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 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 b5468ee..f885e6d 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -19,6 +19,13 @@</span><br><span> AC_PROG_INSTALL</span><br><span> AC_PROG_RANLIB</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+dnl check for pkg-config (explained in detail in libosmocore/configure.ac)</span><br><span style="color: hsl(120, 100%, 40%);">+AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no)</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$PKG_CONFIG_INSTALLED" = "xno"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_WARN([You need to install pkg-config])</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+PKG_PROG_PKG_CONFIG([0.20])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> dnl checks for header files</span><br><span> AC_HEADER_STDC</span><br><span> </span><br><span>@@ -52,6 +59,21 @@</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%);">+ 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_ARG_ENABLE([external_tests],</span><br><span> AC_HELP_STRING([--enable-external-tests],</span><br><span> [Include the VTY tests in make check [default=no]]),</span><br><span>@@ -122,5 +144,6 @@</span><br><span> include/osmo-pcap/Makefile</span><br><span> src/Makefile</span><br><span> contrib/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ contrib/systemd/Makefile</span><br><span> tests/Makefile</span><br><span> Makefile)</span><br><span>diff --git a/contrib/Makefile.am b/contrib/Makefile.am</span><br><span>index 3585924..7bd8c23 100644</span><br><span>--- a/contrib/Makefile.am</span><br><span>+++ b/contrib/Makefile.am</span><br><span>@@ -1,2 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = systemd</span><br><span> dist_pkgdata_DATA = osmo_pcap_clean_old</span><br><span> EXTRA_DIST = osmo-pcap-server.cfg osmo-pcap-client.cfg</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..5b41c52</span><br><span>--- /dev/null</span><br><span>+++ b/contrib/systemd/Makefile.am</span><br><span>@@ -0,0 +1,8 @@</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-pcap-client.service \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-pcap-server.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/contrib/systemd/osmo-pcap-client.service b/contrib/systemd/osmo-pcap-client.service</span><br><span>new file mode 100644</span><br><span>index 0000000..fd0de75</span><br><span>--- /dev/null</span><br><span>+++ b/contrib/systemd/osmo-pcap-client.service</span><br><span>@@ -0,0 +1,12 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[Unit]</span><br><span style="color: hsl(120, 100%, 40%);">+Description=PCAP Client for the PCAP aggregation</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[Service]</span><br><span style="color: hsl(120, 100%, 40%);">+Type=simple</span><br><span style="color: hsl(120, 100%, 40%);">+Restart=always</span><br><span style="color: hsl(120, 100%, 40%);">+ExecStart=/usr/bin/osmo-pcap-client -c /etc/osmocom/osmo-pcap-client.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+RestartSec=2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[Install]</span><br><span style="color: hsl(120, 100%, 40%);">+WantedBy=multi-user.target</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/contrib/systemd/osmo-pcap-server.service b/contrib/systemd/osmo-pcap-server.service</span><br><span>new file mode 100644</span><br><span>index 0000000..3094fc4</span><br><span>--- /dev/null</span><br><span>+++ b/contrib/systemd/osmo-pcap-server.service</span><br><span>@@ -0,0 +1,12 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[Unit]</span><br><span style="color: hsl(120, 100%, 40%);">+Description=PCAP Server for the PCAP aggregation</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[Service]</span><br><span style="color: hsl(120, 100%, 40%);">+Type=simple</span><br><span style="color: hsl(120, 100%, 40%);">+Restart=always</span><br><span style="color: hsl(120, 100%, 40%);">+ExecStart=/usr/bin/osmo-pcap-server -c /etc/osmocom/osmo-pcap-server.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+RestartSec=2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[Install]</span><br><span style="color: hsl(120, 100%, 40%);">+WantedBy=multi-user.target</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/debian/osmo-pcap-client.install b/debian/osmo-pcap-client.install</span><br><span>index f149b14..ac7c65c 100644</span><br><span>--- a/debian/osmo-pcap-client.install</span><br><span>+++ b/debian/osmo-pcap-client.install</span><br><span>@@ -1 +1,2 @@</span><br><span style="color: hsl(120, 100%, 40%);">+lib/systemd/system/osmo-pcap-client.service</span><br><span> usr/bin/osmo-pcap-client</span><br><span>diff --git a/debian/osmo-pcap-server.install b/debian/osmo-pcap-server.install</span><br><span>index ad58c8e..6ba698e 100644</span><br><span>--- a/debian/osmo-pcap-server.install</span><br><span>+++ b/debian/osmo-pcap-server.install</span><br><span>@@ -1 +1,2 @@</span><br><span style="color: hsl(120, 100%, 40%);">+lib/systemd/system/osmo-pcap-server.service</span><br><span> usr/bin/osmo-pcap-server</span><br><span>diff --git a/debian/rules b/debian/rules</span><br><span>index 6862888..a9a8b30 100755</span><br><span>--- a/debian/rules</span><br><span>+++ b/debian/rules</span><br><span>@@ -16,6 +16,7 @@</span><br><span> </span><br><span> override_dh_auto_configure:</span><br><span> dh_auto_configure -- \</span><br><span style="color: hsl(120, 100%, 40%);">+ --with-systemdsystemunitdir=/lib/systemd/system \</span><br><span> --with-pcap-config=/bin/false \</span><br><span> PCAP_CFLAGS=$(PCAP_CFLAGS) \</span><br><span> PCAP_LIBS=$(PCAP_LIBS)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11545">change 11545</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/11545"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcap </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id938f3dab4826ac748abb5e0b169d800c2a625a5 </div>
<div style="display:none"> Gerrit-Change-Number: 11545 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>