Change in osmo-bsc[master]: Install systemd services with autotools
Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10897 ) Change subject: Install systemd services with autotools .. Install systemd services with autotools Change-Id: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-bsc.install D debian/osmo-bsc.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 2f0a786..60a5b4e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,11 +13,15 @@ include \ src \ tests \ + contrib \ $(NULL) BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index 54d6a83..c6fa9a1 100644 --- a/configure.ac +++ b/configure.ac @@ -157,6 +157,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "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"]) @@ -183,4 +199,6 @@ tests/handover/Makefile doc/Makefile doc/examples/Makefile +contrib/Makefile +contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 000..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 000..5119adf --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-bsc.service +systemdsystemunit_DATA = \ + osmo-bsc.service +endif diff --git a/debian/osmo-bsc.install b/debian/osmo-bsc.install index 5dc1e0f..651ddb3 100644 --- a/debian/osmo-bsc.install +++ b/debian/osmo-bsc.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-bsc.service usr/bin/osmo-bsc usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg usr/share/doc/osmo-bsc/examples usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc.cfg usr/share/doc/osmo-bsc/examples diff --git a/debian/osmo-bsc.service b/debian/osmo-bsc.service deleted file mode 12 index ce03af1..000 --- a/debian/osmo-bsc.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-bsc.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 71ffbf1..ffc99db 100755 --- a/debian/rules +++ b/debian/rules @@ -42,8 +42,10 @@ # main packaging script based on dh7 syntax %: - dh $@ --with autoreconf + dh $@ --with autoreconf +# debmake generated override targets +CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) # -- To view, visit https://gerrit.osmocom.org/10897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e Gerrit-Change-Number: 10897 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-bsc[master]: Install systemd services with autotools
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10897 ) Change subject: Install systemd services with autotools .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e Gerrit-Change-Number: 10897 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Sep 2018 13:58:23 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: Install systemd services with autotools
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10897 ) Change subject: Install systemd services with autotools .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e Gerrit-Change-Number: 10897 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 13 Sep 2018 13:58:10 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: Install systemd services with autotools
Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10897 Change subject: Install systemd services with autotools .. Install systemd services with autotools Change-Id: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am M debian/osmo-bsc.install D debian/osmo-bsc.service M debian/rules 7 files changed, 32 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/10897/1 diff --git a/Makefile.am b/Makefile.am index 2f0a786..60a5b4e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,11 +13,15 @@ include \ src \ tests \ + contrib \ $(NULL) BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index 54d6a83..c6fa9a1 100644 --- a/configure.ac +++ b/configure.ac @@ -157,6 +157,22 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "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"]) @@ -183,4 +199,6 @@ tests/handover/Makefile doc/Makefile doc/examples/Makefile +contrib/Makefile +contrib/systemd/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 000..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 000..5119adf --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,5 @@ +if HAVE_SYSTEMD +EXTRA_DIST = osmo-bsc.service +systemdsystemunit_DATA = \ + osmo-bsc.service +endif diff --git a/debian/osmo-bsc.install b/debian/osmo-bsc.install index 5dc1e0f..651ddb3 100644 --- a/debian/osmo-bsc.install +++ b/debian/osmo-bsc.install @@ -1,3 +1,4 @@ +lib/systemd/system/osmo-bsc.service usr/bin/osmo-bsc usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg usr/share/doc/osmo-bsc/examples usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc.cfg usr/share/doc/osmo-bsc/examples diff --git a/debian/osmo-bsc.service b/debian/osmo-bsc.service deleted file mode 12 index ce03af1..000 --- a/debian/osmo-bsc.service +++ /dev/null @@ -1 +0,0 @@ -../contrib/systemd/osmo-bsc.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index 71ffbf1..ffc99db 100755 --- a/debian/rules +++ b/debian/rules @@ -42,8 +42,10 @@ # main packaging script based on dh7 syntax %: - dh $@ --with autoreconf + dh $@ --with autoreconf +# debmake generated override targets +CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) # -- To view, visit https://gerrit.osmocom.org/10897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e Gerrit-Change-Number: 10897 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol
