<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10898">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: I87299134696bbfc6721b1226d4de6c73854aa846<br>---<br>M Makefile.am<br>M configure.ac<br>A contrib/Makefile.am<br>D contrib/sysmobts.service<br>A contrib/systemd/Makefile.am<br>R contrib/systemd/lc15bts-mgr.service<br>R contrib/systemd/osmo-bts-lc15.service<br>R contrib/systemd/osmo-bts-sysmo.service<br>R contrib/systemd/sysmobts-mgr.service<br>M debian/osmo-bts-trx.install<br>D debian/osmo-bts-trx.service<br>M debian/osmo-bts-virtual.install<br>D debian/osmo-bts-virtual.service<br>M debian/rules<br>14 files changed, 45 insertions(+), 25 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 10ff2d2..b573aa8 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -1,11 +1,11 @@</span><br><span> AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-SUBDIRS = include src tests doc</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = include src tests doc contrib</span><br><span> </span><br><span> </span><br><span> # package the contrib and doc</span><br><span> EXTRA_DIST = \</span><br><span style="color: hsl(0, 100%, 40%);">-      contrib/dump_docs.py contrib/screenrc-l1fwd contrib/osmo-bts-sysmo.service \</span><br><span style="color: hsl(120, 100%, 40%);">+  contrib/dump_docs.py contrib/screenrc-l1fwd \</span><br><span>        contrib/l1fwd.init contrib/screenrc-sysmobts contrib/respawn.sh \</span><br><span>    doc/examples/sysmo/osmo-bts.cfg \</span><br><span>    doc/examples/sysmo/sysmobts-mgr.cfg \</span><br><span>@@ -14,6 +14,9 @@</span><br><span>    git-version-gen .version \</span><br><span>   README.md</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> BUILT_SOURCES = $(top_srcdir)/.version</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index aad55db..38e6713 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -279,6 +279,22 @@</span><br><span>       CPPFLAGS=$oldCPPFLAGS</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>@@ -307,4 +323,6 @@</span><br><span>     tests/meas/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/sysmobts.service b/contrib/sysmobts.service</span><br><span>deleted file mode 100644</span><br><span>index 64e0127..0000000</span><br><span>--- a/contrib/sysmobts.service</span><br><span>+++ /dev/null</span><br><span>@@ -1,20 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[Unit]</span><br><span style="color: hsl(0, 100%, 40%);">-Description=sysmocom sysmoBTS</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[Service]</span><br><span style="color: hsl(0, 100%, 40%);">-Type=simple</span><br><span style="color: hsl(0, 100%, 40%);">-ExecStartPre=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness'</span><br><span style="color: hsl(0, 100%, 40%);">-ExecStart=/usr/bin/osmo-bts-sysmo -s -c /etc/osmocom/osmo-bts.cfg -M</span><br><span style="color: hsl(0, 100%, 40%);">-ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness'</span><br><span style="color: hsl(0, 100%, 40%);">-ExecStopPost=/bin/sh -c 'cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; sleep 3s; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0; sleep 1s'</span><br><span style="color: hsl(0, 100%, 40%);">-Restart=always</span><br><span style="color: hsl(0, 100%, 40%);">-RestartSec=2</span><br><span style="color: hsl(0, 100%, 40%);">-RestartPreventExitStatus=1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# The msg queues must be read fast enough</span><br><span style="color: hsl(0, 100%, 40%);">-CPUSchedulingPolicy=rr</span><br><span style="color: hsl(0, 100%, 40%);">-CPUSchedulingPriority=1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[Install]</span><br><span style="color: hsl(0, 100%, 40%);">-WantedBy=multi-user.target</span><br><span style="color: hsl(0, 100%, 40%);">-Alias=osmo-bts-sysmo.service</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..1646308</span><br><span>--- /dev/null</span><br><span>+++ b/contrib/systemd/Makefile.am</span><br><span>@@ -0,0 +1,18 @@</span><br><span style="color: hsl(120, 100%, 40%);">+if HAVE_SYSTEMD</span><br><span style="color: hsl(120, 100%, 40%);">+SYSTEMD_SERVICES = osmo-bts-virtual.service</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if ENABLE_SYSMOBTS</span><br><span style="color: hsl(120, 100%, 40%);">+SYSTEMD_SERVICES += osmo-bts-sysmo.service sysmobts-mgr.service</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if ENABLE_TRX</span><br><span style="color: hsl(120, 100%, 40%);">+SYSTEMD_SERVICES += osmo-bts-trx.service</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if ENABLE_LC15BTS</span><br><span style="color: hsl(120, 100%, 40%);">+SYSTEMD_SERVICES += osmo-bts-lc15.service lc15bts-mgr.service</span><br><span style="color: hsl(120, 100%, 40%);">+endif</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 # HAVE_SYSTEMD</span><br><span>diff --git a/contrib/lc15bts-mgr.service b/contrib/systemd/lc15bts-mgr.service</span><br><span>similarity index 100%</span><br><span>rename from contrib/lc15bts-mgr.service</span><br><span>rename to contrib/systemd/lc15bts-mgr.service</span><br><span>diff --git a/contrib/osmo-bts-lc15.service b/contrib/systemd/osmo-bts-lc15.service</span><br><span>similarity index 100%</span><br><span>rename from contrib/osmo-bts-lc15.service</span><br><span>rename to contrib/systemd/osmo-bts-lc15.service</span><br><span>diff --git a/contrib/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service</span><br><span>similarity index 100%</span><br><span>rename from contrib/osmo-bts-sysmo.service</span><br><span>rename to contrib/systemd/osmo-bts-sysmo.service</span><br><span>diff --git a/contrib/sysmobts-mgr.service b/contrib/systemd/sysmobts-mgr.service</span><br><span>similarity index 100%</span><br><span>rename from contrib/sysmobts-mgr.service</span><br><span>rename to contrib/systemd/sysmobts-mgr.service</span><br><span>diff --git a/debian/osmo-bts-trx.install b/debian/osmo-bts-trx.install</span><br><span>index e821cb4..2343d25 100644</span><br><span>--- a/debian/osmo-bts-trx.install</span><br><span>+++ b/debian/osmo-bts-trx.install</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+lib/systemd/system/osmo-bts-trx.service</span><br><span> usr/bin/osmo-bts-trx</span><br><span> usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts.cfg</span><br><span> usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts-trx-calypso.cfg</span><br><span>diff --git a/debian/osmo-bts-trx.service b/debian/osmo-bts-trx.service</span><br><span>deleted file mode 120000</span><br><span>index 1abb0ce..0000000</span><br><span>--- a/debian/osmo-bts-trx.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../contrib/systemd/osmo-bts-trx.service</span><br><span>\ No newline at end of file</span><br><span>diff --git a/debian/osmo-bts-virtual.install b/debian/osmo-bts-virtual.install</span><br><span>index 3815d7c..0e6ca1b 100644</span><br><span>--- a/debian/osmo-bts-virtual.install</span><br><span>+++ b/debian/osmo-bts-virtual.install</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+lib/systemd/system/osmo-bts-virtual.service</span><br><span> usr/bin/osmo-bts-virtual</span><br><span> usr/bin/osmo-bts-omldummy</span><br><span> usr/share/doc/osmo-bts/examples/osmo-bts-virtual/osmobts-virtual.cfg</span><br><span>diff --git a/debian/osmo-bts-virtual.service b/debian/osmo-bts-virtual.service</span><br><span>deleted file mode 120000</span><br><span>index 9a660b4..0000000</span><br><span>--- a/debian/osmo-bts-virtual.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../contrib/systemd/osmo-bts-virtual.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 dcc8a11..27de11b 100755</span><br><span>--- a/debian/rules</span><br><span>+++ b/debian/rules</span><br><span>@@ -16,7 +16,7 @@</span><br><span>       dh_strip --package=osmo-bts-trx --dbg-package=osmo-bts-trx-dbg</span><br><span> </span><br><span> override_dh_auto_configure:</span><br><span style="color: hsl(0, 100%, 40%);">-       dh_auto_configure --  --enable-trx</span><br><span style="color: hsl(120, 100%, 40%);">+    dh_auto_configure --  --enable-trx --with-systemdsystemunitdir=/lib/systemd/system</span><br><span> </span><br><span> override_dh_clean:</span><br><span>         dh_clean</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10898">change 10898</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/10898"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I87299134696bbfc6721b1226d4de6c73854aa846 </div>
<div style="display:none"> Gerrit-Change-Number: 10898 </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>