<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10900">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: Ia1a4fb62dee35737ece1f3501f352501eba2449e<br>---<br>M Makefile.am<br>M configure.ac<br>A contrib/Makefile.am<br>A contrib/systemd/Makefile.am<br>M debian/osmo-trx-lms.install<br>D debian/osmo-trx-lms.service<br>M debian/osmo-trx-uhd.install<br>D debian/osmo-trx-uhd.service<br>M debian/osmo-trx-usrp1.install<br>D debian/osmo-trx-usrp1.service<br>M debian/patches/build-for-debian8.patch<br>M debian/rules<br>12 files changed, 47 insertions(+), 6 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 8ab73a6..38cd88d 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -32,6 +32,7 @@</span><br><span> CommonLibs \</span><br><span> GSM \</span><br><span> Transceiver52M \</span><br><span style="color: hsl(120, 100%, 40%);">+ contrib \</span><br><span> tests</span><br><span> </span><br><span> EXTRA_DIST = \</span><br><span>@@ -41,6 +42,9 @@</span><br><span> COPYING \</span><br><span> README</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> .PHONY: release</span><br><span> </span><br><span> @RELMAKE@</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index daa8677..64e3b35 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -223,6 +223,22 @@</span><br><span> AC_CHECK_HEADER([boost/config.hpp],[],</span><br><span> [AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])])</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([CPPFLAGS="$CPPFLAGS"])</span><br><span> AC_MSG_RESULT([CFLAGS="$CFLAGS"])</span><br><span> AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"])</span><br><span>@@ -247,6 +263,8 @@</span><br><span> tests/Transceiver52M/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> ])</span><br><span> </span><br><span> AC_OUTPUT</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..21fbb53</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 =</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if DEVICE_UHD</span><br><span style="color: hsl(120, 100%, 40%);">+SYSTEMD_SERVICES += osmo-trx-uhd.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 DEVICE_USRP1</span><br><span style="color: hsl(120, 100%, 40%);">+SYSTEMD_SERVICES += osmo-trx-usrp1.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 DEVICE_LMS</span><br><span style="color: hsl(120, 100%, 40%);">+SYSTEMD_SERVICES += osmo-trx-lms.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/debian/osmo-trx-lms.install b/debian/osmo-trx-lms.install</span><br><span>index dd9d407..b58c862 100644</span><br><span>--- a/debian/osmo-trx-lms.install</span><br><span>+++ b/debian/osmo-trx-lms.install</span><br><span>@@ -1,2 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+lib/systemd/system/osmo-trx-lms.service</span><br><span> /usr/bin/osmo-trx-lms</span><br><span> /usr/share/doc/osmo-trx/examples/osmo-trx-lms/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-lms/</span><br><span>diff --git a/debian/osmo-trx-lms.service b/debian/osmo-trx-lms.service</span><br><span>deleted file mode 120000</span><br><span>index d2d697a..0000000</span><br><span>--- a/debian/osmo-trx-lms.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../contrib/systemd/osmo-trx-lms.service</span><br><span>\ No newline at end of file</span><br><span>diff --git a/debian/osmo-trx-uhd.install b/debian/osmo-trx-uhd.install</span><br><span>index 8944b13..b7ec5ca 100644</span><br><span>--- a/debian/osmo-trx-uhd.install</span><br><span>+++ b/debian/osmo-trx-uhd.install</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+lib/systemd/system/osmo-trx-uhd.service</span><br><span> /usr/bin/osmo-trx-uhd</span><br><span> /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/</span><br><span> /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/</span><br><span>diff --git a/debian/osmo-trx-uhd.service b/debian/osmo-trx-uhd.service</span><br><span>deleted file mode 120000</span><br><span>index c67648f..0000000</span><br><span>--- a/debian/osmo-trx-uhd.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../contrib/systemd/osmo-trx-uhd.service</span><br><span>\ No newline at end of file</span><br><span>diff --git a/debian/osmo-trx-usrp1.install b/debian/osmo-trx-usrp1.install</span><br><span>index c7e54b1..112a149 100644</span><br><span>--- a/debian/osmo-trx-usrp1.install</span><br><span>+++ b/debian/osmo-trx-usrp1.install</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+lib/systemd/system/osmo-trx-usrp1.service</span><br><span> /usr/bin/osmo-trx-usrp1</span><br><span> /usr/share/usrp/rev2/std_inband.rbf</span><br><span> /usr/share/usrp/rev4/std_inband.rbf</span><br><span>diff --git a/debian/osmo-trx-usrp1.service b/debian/osmo-trx-usrp1.service</span><br><span>deleted file mode 120000</span><br><span>index a7b33ad..0000000</span><br><span>--- a/debian/osmo-trx-usrp1.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../contrib/systemd/osmo-trx-usrp1.service</span><br><span>\ No newline at end of file</span><br><span>diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch</span><br><span>index d44eb2f..cd1f356 100644</span><br><span>--- a/debian/patches/build-for-debian8.patch</span><br><span>+++ b/debian/patches/build-for-debian8.patch</span><br><span>@@ -50,8 +50,8 @@</span><br><span> dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info</span><br><span> </span><br><span> override_dh_auto_configure:</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_auto_configure -- --with-uhd --with-usrp1 --with-lms</span><br><span style="color: hsl(0, 100%, 40%);">-+ dh_auto_configure -- --with-uhd --with-usrp1</span><br><span style="color: hsl(120, 100%, 40%);">+- dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system</span><br><span style="color: hsl(120, 100%, 40%);">++ dh_auto_configure -- --with-uhd --with-usrp1 --with-systemdsystemunitdir=/lib/systemd/system</span><br><span> </span><br><span> override_dh_strip:</span><br><span> dh_strip --dbg-package=osmo-trx-dbg</span><br><span>diff --git a/debian/rules b/debian/rules</span><br><span>index 8081162..68de706 100755</span><br><span>--- a/debian/rules</span><br><span>+++ b/debian/rules</span><br><span>@@ -9,7 +9,7 @@</span><br><span> dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info</span><br><span> </span><br><span> override_dh_auto_configure:</span><br><span style="color: hsl(0, 100%, 40%);">- dh_auto_configure -- --with-uhd --with-usrp1 --with-lms</span><br><span style="color: hsl(120, 100%, 40%);">+ dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system</span><br><span> </span><br><span> override_dh_strip:</span><br><span> dh_strip --dbg-package=osmo-trx-dbg</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10900">change 10900</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/10900"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia1a4fb62dee35737ece1f3501f352501eba2449e </div>
<div style="display:none"> Gerrit-Change-Number: 10900 </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>