<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10902">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: I9bc40cf9e9a901d28d1f1629f6f1d55e8ba0c0b6<br>---<br>M debian/control<br>M debian/osmo-bsc-mgcp.install<br>D debian/osmo-bsc-mgcp.service<br>M debian/osmocom-bsc-nat.install<br>D debian/osmocom-bsc-nat.service<br>M debian/osmocom-bsc-sccplite.install<br>D debian/osmocom-bsc-sccplite.service<br>M debian/osmocom-nitb.install<br>D debian/osmocom-nitb.service<br>M debian/rules<br>M openbsc/Makefile.am<br>M openbsc/configure.ac<br>A openbsc/contrib/Makefile.am<br>A openbsc/contrib/systemd/Makefile.am<br>D openbsc/debian/osmo-bsc-mgcp.service<br>15 files changed, 45 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian/control b/debian/control</span><br><span>index 46a8ab5..0e9bb0c 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -10,6 +10,7 @@</span><br><span> libosmo-sccp-dev,</span><br><span> libdbi0-dev,</span><br><span> dh-autoreconf,</span><br><span style="color: hsl(120, 100%, 40%);">+ dh-systemd (>= 1.5),</span><br><span> libosmo-abis-dev,</span><br><span> libosmo-netif-dev,</span><br><span> libdbd-sqlite3,</span><br><span>diff --git a/debian/osmo-bsc-mgcp.install b/debian/osmo-bsc-mgcp.install</span><br><span>index 1550437..828fb31 100644</span><br><span>--- a/debian/osmo-bsc-mgcp.install</span><br><span>+++ b/debian/osmo-bsc-mgcp.install</span><br><span>@@ -1 +1,2 @@</span><br><span style="color: hsl(120, 100%, 40%);">+lib/systemd/system/osmo-bsc-mgcp.service</span><br><span> usr/bin/osmo-bsc_mgcp</span><br><span>diff --git a/debian/osmo-bsc-mgcp.service b/debian/osmo-bsc-mgcp.service</span><br><span>deleted file mode 120000</span><br><span>index 0f8700b..0000000</span><br><span>--- a/debian/osmo-bsc-mgcp.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../openbsc/contrib/systemd/osmo-bsc-mgcp.service</span><br><span>\ No newline at end of file</span><br><span>diff --git a/debian/osmocom-bsc-nat.install b/debian/osmocom-bsc-nat.install</span><br><span>index b561a7e..d6cabe2 100644</span><br><span>--- a/debian/osmocom-bsc-nat.install</span><br><span>+++ b/debian/osmocom-bsc-nat.install</span><br><span>@@ -1 +1,2 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/lib/systemd/system/osmo-bsc-nat.service</span><br><span> /usr/bin/osmo-bsc_nat</span><br><span>diff --git a/debian/osmocom-bsc-nat.service b/debian/osmocom-bsc-nat.service</span><br><span>deleted file mode 120000</span><br><span>index 0d5b3be..0000000</span><br><span>--- a/debian/osmocom-bsc-nat.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../openbsc/contrib/systemd/osmo-bsc-nat.service</span><br><span>\ No newline at end of file</span><br><span>diff --git a/debian/osmocom-bsc-sccplite.install b/debian/osmocom-bsc-sccplite.install</span><br><span>index 9ce795c..67c50cb 100644</span><br><span>--- a/debian/osmocom-bsc-sccplite.install</span><br><span>+++ b/debian/osmocom-bsc-sccplite.install</span><br><span>@@ -1,2 +1,2 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/usr/bin/osmo-bsc_mgcp</span><br><span style="color: hsl(120, 100%, 40%);">+/lib/systemd/system/osmo-bsc-sccplite.service</span><br><span> /usr/bin/osmo-bsc-sccplite</span><br><span>diff --git a/debian/osmocom-bsc-sccplite.service b/debian/osmocom-bsc-sccplite.service</span><br><span>deleted file mode 120000</span><br><span>index f30a9db..0000000</span><br><span>--- a/debian/osmocom-bsc-sccplite.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../openbsc/contrib/systemd/osmo-bsc-sccplite.service</span><br><span>\ No newline at end of file</span><br><span>diff --git a/debian/osmocom-nitb.install b/debian/osmocom-nitb.install</span><br><span>index 26caf71..78e8f77 100644</span><br><span>--- a/debian/osmocom-nitb.install</span><br><span>+++ b/debian/osmocom-nitb.install</span><br><span>@@ -1,2 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/lib/systemd/system/osmo-nitb.service</span><br><span> /usr/bin/osmo-nitb</span><br><span style="color: hsl(0, 100%, 40%);">-openbsc/contrib/*.py usr/bin/</span><br><span>\ No newline at end of file</span><br><span style="color: hsl(120, 100%, 40%);">+openbsc/contrib/*.py usr/bin/</span><br><span>diff --git a/debian/osmocom-nitb.service b/debian/osmocom-nitb.service</span><br><span>deleted file mode 120000</span><br><span>index eaecd9d..0000000</span><br><span>--- a/debian/osmocom-nitb.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../openbsc/contrib/systemd/osmo-nitb.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 ef08596..e37a262 100755</span><br><span>--- a/debian/rules</span><br><span>+++ b/debian/rules</span><br><span>@@ -10,7 +10,7 @@</span><br><span> export DEB_BUILD_MAINT_OPTIONS = hardening=+all</span><br><span> </span><br><span> %:</span><br><span style="color: hsl(0, 100%, 40%);">- dh $@ --sourcedirectory=openbsc --with autoreconf</span><br><span style="color: hsl(120, 100%, 40%);">+ dh $@ --sourcedirectory=openbsc --with=systemd --with autoreconf</span><br><span> </span><br><span> # This is needed for debian stable (squeeze)</span><br><span> override_dh_autoreconf:</span><br><span>@@ -25,7 +25,7 @@</span><br><span> </span><br><span> override_dh_auto_configure:</span><br><span> echo $(VERSION) > openbsc/.tarball-version</span><br><span style="color: hsl(0, 100%, 40%);">- dh_auto_configure --sourcedirectory=openbsc -- --enable-nat --enable-osmo-bsc --enable-smpp</span><br><span style="color: hsl(120, 100%, 40%);">+ dh_auto_configure --sourcedirectory=openbsc -- --enable-nat --enable-osmo-bsc --enable-smpp --with-systemdsystemunitdir=/lib/systemd/system</span><br><span> </span><br><span> # Print test results in case of a failure</span><br><span> override_dh_auto_test:</span><br><span>diff --git a/openbsc/Makefile.am b/openbsc/Makefile.am</span><br><span>index dc53929..792dcf2 100644</span><br><span>--- a/openbsc/Makefile.am</span><br><span>+++ b/openbsc/Makefile.am</span><br><span>@@ -13,6 +13,7 @@</span><br><span> include \</span><br><span> src \</span><br><span> tests \</span><br><span style="color: hsl(120, 100%, 40%);">+ contrib \</span><br><span> $(NULL)</span><br><span> </span><br><span> pkgconfigdir = $(libdir)/pkgconfig</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/openbsc/configure.ac b/openbsc/configure.ac</span><br><span>index c3615d6..75dd5d3 100644</span><br><span>--- a/openbsc/configure.ac</span><br><span>+++ b/openbsc/configure.ac</span><br><span>@@ -220,6 +220,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>@@ -262,4 +278,6 @@</span><br><span> tests/nanobts_omlattr/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/openbsc/contrib/Makefile.am b/openbsc/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/openbsc/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/openbsc/contrib/systemd/Makefile.am b/openbsc/contrib/systemd/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..69f973e</span><br><span>--- /dev/null</span><br><span>+++ b/openbsc/contrib/systemd/Makefile.am</span><br><span>@@ -0,0 +1,14 @@</span><br><span style="color: hsl(120, 100%, 40%);">+if HAVE_SYSTEMD</span><br><span style="color: hsl(120, 100%, 40%);">+SYSTEMD_SERVICES = osmo-nitb.service osmo-bsc-mgcp.service</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if BUILD_NAT</span><br><span style="color: hsl(120, 100%, 40%);">+SYSTEMD_SERVICES += osmo-bsc-nat.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 BUILD_BSC</span><br><span style="color: hsl(120, 100%, 40%);">+SYSTEMD_SERVICES += osmo-bsc-sccplite.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/openbsc/debian/osmo-bsc-mgcp.service b/openbsc/debian/osmo-bsc-mgcp.service</span><br><span>deleted file mode 120000</span><br><span>index eb73b7b..0000000</span><br><span>--- a/openbsc/debian/osmo-bsc-mgcp.service</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../contrib/systemd/osmo-bsc-mgcp.service</span><br><span>\ No newline at end of file</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10902">change 10902</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/10902"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I9bc40cf9e9a901d28d1f1629f6f1d55e8ba0c0b6 </div>
<div style="display:none"> Gerrit-Change-Number: 10902 </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>