<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10855">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "Install systemd services with autotools"<br><br>This reverts commit ba3da6d72564bb2c60f4f4a8d641b8a7b86d1f59.<br><br>That commit broke master-{osmo-iuh,osmo-msc,osmo-sgsn,openbsc,osmo-bsc}<br>build jobs with<br><br>make[4]: Nothing to be done for 'install-exec-am'.<br> /bin/mkdir -p '/lib/systemd/system'<br> /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system'<br>/usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied<br>make[4]: *** [install-systemdsystemunitDATA] Error 1<br><br>Change-Id: I009825d293e7e7a6c48d10452c10b3bb6da3e684<br>---<br>M Makefile.am<br>M configure.ac<br>D contrib/Makefile.am<br>D contrib/systemd/Makefile.am<br>M debian/osmo-stp.install<br>A debian/osmo-stp.service<br>M debian/rules<br>7 files changed, 3 insertions(+), 29 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/55/10855/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.am b/Makefile.am</span><br><span>index 7d09259..3f4de13 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -1,16 +1,13 @@</span><br><span> AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6</span><br><span> </span><br><span> AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include</span><br><span style="color: hsl(0, 100%, 40%);">-SUBDIRS = include src tests examples stp doc contrib</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = include src tests examples stp doc</span><br><span> </span><br><span> pkgconfigdir = $(libdir)/pkgconfig</span><br><span> pkgconfig_DATA = libosmo-sccp.pc libosmo-mtp.pc libosmo-sigtran.pc libosmo-xua.pc</span><br><span> </span><br><span> EXTRA_DIST = .version git-version-gen osmoappdesc.py doc/examples/osmo-stp.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DISTCHECK_CONFIGURE_FLAGS = \</span><br><span style="color: hsl(0, 100%, 40%);">- --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)</span><br><span style="color: hsl(0, 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 af64bc0..c0cc488 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -98,21 +98,6 @@</span><br><span> AC_PATH_PROG(DOXYGEN,doxygen,false)</span><br><span> AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# https://www.freedesktop.org/software/systemd/man/daemon.html</span><br><span style="color: hsl(0, 100%, 40%);">-AC_ARG_WITH([systemdsystemunitdir],</span><br><span style="color: hsl(0, 100%, 40%);">- [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,</span><br><span style="color: hsl(0, 100%, 40%);">- [with_systemdsystemunitdir=auto])</span><br><span style="color: hsl(0, 100%, 40%);">-AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [</span><br><span style="color: hsl(0, 100%, 40%);">- def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)</span><br><span style="color: hsl(0, 100%, 40%);">- AS_IF([test "x$def_systemdsystemunitdir" = "x"],</span><br><span style="color: hsl(0, 100%, 40%);">- [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],</span><br><span style="color: hsl(0, 100%, 40%);">- [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])</span><br><span style="color: hsl(0, 100%, 40%);">- with_systemdsystemunitdir=no],</span><br><span style="color: hsl(0, 100%, 40%);">- [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])</span><br><span style="color: hsl(0, 100%, 40%);">-AS_IF([test "x$with_systemdsystemunitdir" != "xno"],</span><br><span style="color: hsl(0, 100%, 40%);">- [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> AC_MSG_RESULT([CFLAGS="$CFLAGS"])</span><br><span> AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])</span><br><span> </span><br><span>@@ -137,7 +122,5 @@</span><br><span> stp/Makefile</span><br><span> doc/Makefile</span><br><span> doc/examples/Makefile</span><br><span style="color: hsl(0, 100%, 40%);">- contrib/Makefile</span><br><span style="color: hsl(0, 100%, 40%);">- contrib/systemd/Makefile</span><br><span> Doxyfile</span><br><span> Makefile)</span><br><span>diff --git a/contrib/Makefile.am b/contrib/Makefile.am</span><br><span>deleted file mode 100644</span><br><span>index 3439c97..0000000</span><br><span>--- a/contrib/Makefile.am</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-SUBDIRS = systemd</span><br><span>diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am</span><br><span>deleted file mode 100644</span><br><span>index e7d846f..0000000</span><br><span>--- a/contrib/systemd/Makefile.am</span><br><span>+++ /dev/null</span><br><span>@@ -1,5 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-if HAVE_SYSTEMD</span><br><span style="color: hsl(0, 100%, 40%);">-EXTRA_DIST = osmo-stp.service</span><br><span style="color: hsl(0, 100%, 40%);">-systemdsystemunit_DATA = \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-stp.service</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span>diff --git a/debian/osmo-stp.install b/debian/osmo-stp.install</span><br><span>index 2c250b0..b2f8077 100644</span><br><span>--- a/debian/osmo-stp.install</span><br><span>+++ b/debian/osmo-stp.install</span><br><span>@@ -1,3 +1,2 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/lib/sytemd/system/osmo-stp.service</span><br><span> /usr/bin/osmo-stp</span><br><span> /usr/share/doc/libosmo-sccp/examples/osmo-stp/osmo-stp.cfg</span><br><span>diff --git a/debian/osmo-stp.service b/debian/osmo-stp.service</span><br><span>new file mode 120000</span><br><span>index 0000000..55f37c2</span><br><span>--- /dev/null</span><br><span>+++ b/debian/osmo-stp.service</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+../contrib/systemd/osmo-stp.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 c0c9f0c..bea0a76 100755</span><br><span>--- a/debian/rules</span><br><span>+++ b/debian/rules</span><br><span>@@ -24,7 +24,7 @@</span><br><span> dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)</span><br><span> </span><br><span> override_dh_auto_configure:</span><br><span style="color: hsl(0, 100%, 40%);">- dh_auto_configure -- --enable-static --with-systemdsystemunitdir=/lib/sytemd/system</span><br><span style="color: hsl(120, 100%, 40%);">+ dh_auto_configure -- --enable-static</span><br><span> </span><br><span> # Print test results in case of a failure</span><br><span> override_dh_auto_test:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10855">change 10855</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/10855"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I009825d293e7e7a6c48d10452c10b3bb6da3e684 </div>
<div style="display:none"> Gerrit-Change-Number: 10855 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>