diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-09-10 10:40:22 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-09-10 17:18:17 +0200 |
commit | 8c481d2825e1135912b5b0f5ae930d8a8cf67385 (patch) | |
tree | ac75dcf61c7e6cb1235a139f5033777e09b355ae | |
parent | c8143eccc2841781af2f09f31222fcc634114bd5 (diff) |
Install systemd services with autotools
This commit re-adds ba3da6d72564bb2c60f4f4a8d641b8a7b86d1f59, plus fixes
two typos (sytemd->systemd) in that commit.
The commit is fine, we just need to add some extra configure flags in
osmo-ci.git.
Depends: https://gerrit.osmocom.org/#/c/osmo-ci/+/10857/
Change-Id: Ifc11d97c0c5fe1f7872b59147b1548b56951921b
-rw-r--r-- | Makefile.am | 5 | ||||
-rw-r--r-- | configure.ac | 17 | ||||
-rw-r--r-- | contrib/Makefile.am | 1 | ||||
-rw-r--r-- | contrib/systemd/Makefile.am | 5 | ||||
-rw-r--r-- | debian/osmo-stp.install | 1 | ||||
l--------- | debian/osmo-stp.service | 1 | ||||
-rwxr-xr-x | debian/rules | 2 |
7 files changed, 29 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 3f4de13..7d09259 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,16 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src tests examples stp doc +SUBDIRS = include src tests examples stp doc contrib 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 c0cc488..af64bc0 100644 --- a/configure.ac +++ b/configure.ac @@ -98,6 +98,21 @@ AC_ARG_ENABLE(doxygen, 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"]) @@ -122,5 +137,7 @@ AC_OUTPUT( stp/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/Makefile Doxyfile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..e7d846f --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +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 b2f8077..839735c 100644 --- a/debian/osmo-stp.install +++ b/debian/osmo-stp.install @@ -1,2 +1,3 @@ +/lib/systemd/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 deleted file mode 120000 index 55f37c2..0000000 --- a/debian/osmo-stp.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-stp.service
\ No newline at end of file diff --git a/debian/rules b/debian/rules index bea0a76..ec5c21c 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) override_dh_auto_configure: - dh_auto_configure -- --enable-static + dh_auto_configure -- --enable-static --with-systemdsystemunitdir=/lib/systemd/system # Print test results in case of a failure override_dh_auto_test: |