Change in libosmo-sccp[master]: Revert "Install systemd services with autotools"

[Harald Welte]

Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10855


Change subject: Revert "Install systemd services with autotools"
......................................................................

Revert "Install systemd services with autotools"

This reverts commit ba3da6d72564bb2c60f4f4a8d641b8a7b86d1f59.

That commit broke master-{osmo-iuh,osmo-msc,osmo-sgsn,openbsc,osmo-bsc}
build jobs with

make[4]: Nothing to be done for 'install-exec-am'.
 /bin/mkdir -p '/lib/systemd/system'
 /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system'
/usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied
make[4]: *** [install-systemdsystemunitDATA] Error 1

Change-Id: I009825d293e7e7a6c48d10452c10b3bb6da3e684
---
M Makefile.am
M configure.ac
D contrib/Makefile.am
D contrib/systemd/Makefile.am
M debian/osmo-stp.install
A debian/osmo-stp.service
M debian/rules
7 files changed, 3 insertions(+), 29 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/55/10855/1

diff --git a/Makefile.am b/Makefile.am
index 7d09259..3f4de13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,13 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-SUBDIRS = include src tests examples stp doc contrib
+SUBDIRS = include src tests examples stp doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libosmo-sccp.pc libosmo-mtp.pc libosmo-sigtran.pc libosmo-xua.pc
 
 EXTRA_DIST = .version git-version-gen osmoappdesc.py doc/examples/osmo-stp.cfg
 
-DISTCHECK_CONFIGURE_FLAGS = \
-  --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
-
 @RELMAKE@
 
 BUILT_SOURCES = $(top_srcdir)/.version
diff --git a/configure.ac b/configure.ac
index af64bc0..c0cc488 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,21 +98,6 @@
 AC_PATH_PROG(DOXYGEN,doxygen,false)
 AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false && test "x$doxygen" = "xyes")
 
-# https://www.freedesktop.org/software/systemd/man/daemon.html
-AC_ARG_WITH([systemdsystemunitdir],
-     [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,
-     [with_systemdsystemunitdir=auto])
-AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [
-     def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
-     AS_IF([test "x$def_systemdsystemunitdir" = "x"],
-   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
-    [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
-    with_systemdsystemunitdir=no],
-   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
-AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
-      [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
-AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
-
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
 
@@ -137,7 +122,5 @@
     stp/Makefile
     doc/Makefile
     doc/examples/Makefile
-    contrib/Makefile
-    contrib/systemd/Makefile
     Doxyfile
     Makefile)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644
index 3439c97..0000000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = systemd
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
deleted file mode 100644
index e7d846f..0000000
--- a/contrib/systemd/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-if HAVE_SYSTEMD
-EXTRA_DIST = osmo-stp.service
-systemdsystemunit_DATA = \
-  osmo-stp.service
-endif
diff --git a/debian/osmo-stp.install b/debian/osmo-stp.install
index 2c250b0..b2f8077 100644
--- a/debian/osmo-stp.install
+++ b/debian/osmo-stp.install
@@ -1,3 +1,2 @@
-/lib/sytemd/system/osmo-stp.service
 /usr/bin/osmo-stp
 /usr/share/doc/libosmo-sccp/examples/osmo-stp/osmo-stp.cfg
diff --git a/debian/osmo-stp.service b/debian/osmo-stp.service
new file mode 120000
index 0000000..55f37c2
--- /dev/null
+++ b/debian/osmo-stp.service
@@ -0,0 +1 @@
+../contrib/systemd/osmo-stp.service
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index c0c9f0c..bea0a76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@
 	dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-static --with-systemdsystemunitdir=/lib/sytemd/system
+	dh_auto_configure -- --enable-static
 
 # Print test results in case of a failure
 override_dh_auto_test:

-- 
To view, visit https://gerrit.osmocom.org/10855
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I009825d293e7e7a6c48d10452c10b3bb6da3e684
Gerrit-Change-Number: 10855
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180909/b7626cc5/attachment.htm>