Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10891 )
Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: I90f1efc4433ec641a28931d5c19e2301a67cf1e9 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-hnbgw.install D debian/osmo-hnbgw.service M debian/rules 7 files changed, 32 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/Makefile.am b/Makefile.am index 67445ee..2e59306 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,15 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 -SUBDIRS = src include doc +SUBDIRS = src include doc contrib pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmo-ranap.pc EXTRA_DIST = asn1 .version README.md +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index bb99dfb..559db39 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,22 @@ CFLAGS="$CFLAGS -Wall" CPPFLAGS="$CPPFLAGS -Wall" +# 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"]) @@ -98,4 +114,6 @@ include/osmocom/iuh/Makefile doc/Makefile doc/examples/Makefile + contrib/Makefile + contrib/systemd/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..507be2d --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-hnbgw.service +systemdsystemunit_DATA = \ + osmo-hnbgw.service +endif diff --git a/debian/osmo-hnbgw.install b/debian/osmo-hnbgw.install index e230915..bb70ad5 100644 --- a/debian/osmo-hnbgw.install +++ b/debian/osmo-hnbgw.install @@ -1,2 +1,3 @@ +lib/systemd/system/osmo-hnbgw.service usr/bin/osmo-hnbgw usr/share/doc/osmo-iuh/examples/osmo-hnbgw.cfg diff --git a/debian/osmo-hnbgw.service b/debian/osmo-hnbgw.service deleted file mode 120000 index e69ea55..0000000 --- a/debian/osmo-hnbgw.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-hnbgw.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 9ebfdd0..6f20b3e 100755 --- a/debian/rules +++ b/debian/rules @@ -16,3 +16,6 @@ # Print test results in case of a failure override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) + +override_dh_auto_configure: + dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system -- To view, visit https://gerrit.osmocom.org/10891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I90f1efc4433ec641a28931d5c19e2301a67cf1e9 Gerrit-Change-Number: 10891 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol <[email protected]> Gerrit-Reviewer: Harald Welte <[email protected]> Gerrit-Reviewer: Pau Espin Pedrol <[email protected]>
