mirror of
https://gitea.osmocom.org/cellular-infrastructure/osmo-sgsn.git
synced 2025-11-02 21:23:14 +00:00
Compare commits
3 Commits
osmith/fix
...
pespin/sys
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
115ea02e5b | ||
|
|
e54321e229 | ||
|
|
0dc7bd7633 |
@@ -12,6 +12,7 @@ SUBDIRS = \
|
||||
doc \
|
||||
include \
|
||||
src \
|
||||
contrib \
|
||||
tests \
|
||||
$(NULL)
|
||||
|
||||
@@ -21,6 +22,9 @@ pkgconfig_DATA = osmo-sgsn.pc
|
||||
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:
|
||||
|
||||
18
configure.ac
18
configure.ac
@@ -176,6 +176,22 @@ AC_MSG_CHECKING([whether to enable VTY/CTRL tests])
|
||||
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"])
|
||||
|
||||
@@ -201,4 +217,6 @@ AC_OUTPUT(
|
||||
tests/v42bis/Makefile
|
||||
doc/Makefile
|
||||
doc/examples/Makefile
|
||||
contrib/Makefile
|
||||
contrib/systemd/Makefile
|
||||
Makefile)
|
||||
|
||||
1
contrib/Makefile.am
Normal file
1
contrib/Makefile.am
Normal file
@@ -0,0 +1 @@
|
||||
SUBDIRS = systemd
|
||||
9
contrib/systemd/Makefile.am
Normal file
9
contrib/systemd/Makefile.am
Normal file
@@ -0,0 +1,9 @@
|
||||
if HAVE_SYSTEMD
|
||||
SYSTEMD_SERVICES = \
|
||||
osmo-gbproxy.service \
|
||||
osmo-gtphub.service \
|
||||
osmo-sgsn.service
|
||||
|
||||
EXTRA_DIST = $(SYSTEMD_SERVICES)
|
||||
systemdsystemunit_DATA = $(SYSTEMD_SERVICES)
|
||||
endif
|
||||
6
debian/control
vendored
6
debian/control
vendored
@@ -4,6 +4,7 @@ Priority: extra
|
||||
Maintainer: Alexander Couzens <lynxis@fe80.eu>
|
||||
Build-Depends: debhelper (>=9),
|
||||
dh-autoreconf,
|
||||
dh-systemd (>= 1.5),
|
||||
autotools-dev,
|
||||
autoconf,
|
||||
automake,
|
||||
@@ -16,7 +17,10 @@ Build-Depends: debhelper (>=9),
|
||||
libosmo-abis-dev,
|
||||
libosmo-ranap-dev,
|
||||
libosmo-sccp-dev,
|
||||
libosmo-netif-dev
|
||||
libosmo-netif-dev,
|
||||
libasn1c-dev (>= 0.9.28),
|
||||
libosmo-sigtran-dev (>= 0.10.0),
|
||||
libosmo-ranap-dev (>= 0.3.0)
|
||||
Standards-Version: 3.9.8
|
||||
Vcs-Git: git://git.osmocom.org/osmo-sgsn.git
|
||||
Vcs-Browser: https://git.osmocom.org/osmo-sgsn
|
||||
|
||||
2
debian/osmo-gbproxy.install
vendored
2
debian/osmo-gbproxy.install
vendored
@@ -1,3 +1,5 @@
|
||||
etc/osmocom/osmo-gbproxy.cfg
|
||||
lib/systemd/system/osmo-gbproxy.service
|
||||
usr/bin/osmo-gbproxy
|
||||
usr/share/doc/osmo-sgsn/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg usr/share/doc/osmo-gbproxy/examples
|
||||
usr/share/doc/osmo-sgsn/examples/osmo-gbproxy/osmo-gbproxy.cfg usr/share/doc/osmo-gbproxy/examples
|
||||
|
||||
1
debian/osmo-gbproxy.service
vendored
1
debian/osmo-gbproxy.service
vendored
@@ -1 +0,0 @@
|
||||
../contrib/systemd/osmo-gbproxy.service
|
||||
2
debian/osmo-gtphub.install
vendored
2
debian/osmo-gtphub.install
vendored
@@ -1,3 +1,5 @@
|
||||
etc/osmocom/osmo-gtphub.cfg
|
||||
lib/systemd/system/osmo-gtphub.service
|
||||
usr/bin/osmo-gtphub
|
||||
usr/share/doc/osmo-sgsn/examples/osmo-gtphub/osmo-gtphub-1iface.cfg usr/share/doc/osmo-gtphub/examples
|
||||
usr/share/doc/osmo-sgsn/examples/osmo-gtphub/osmo-gtphub.cfg usr/share/doc/osmo-gtphub/examples
|
||||
|
||||
1
debian/osmo-gtphub.service
vendored
1
debian/osmo-gtphub.service
vendored
@@ -1 +0,0 @@
|
||||
../contrib/systemd/osmo-gtphub.service
|
||||
2
debian/osmo-sgsn.install
vendored
2
debian/osmo-sgsn.install
vendored
@@ -1,3 +1,5 @@
|
||||
/etc/osmocom/osmo-sgsn.cfg
|
||||
lib/systemd/system/osmo-sgsn.service
|
||||
usr/bin/osmo-sgsn
|
||||
usr/share/doc/osmo-sgsn/examples/osmo-sgsn/osmo-sgsn.cfg usr/share/doc/osmo-sgsn/examples
|
||||
usr/share/doc/osmo-sgsn/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg usr/share/doc/osmo-sgsn/examples
|
||||
|
||||
1
debian/osmo-sgsn.service
vendored
1
debian/osmo-sgsn.service
vendored
@@ -1 +0,0 @@
|
||||
../contrib/systemd/osmo-sgsn.service
|
||||
4
debian/rules
vendored
4
debian/rules
vendored
@@ -46,8 +46,8 @@
|
||||
|
||||
# debmake generated override targets
|
||||
# Set options for ./configure
|
||||
CONFIGURE_FLAGS += --enable-iu
|
||||
override_dh_configure:
|
||||
CONFIGURE_FLAGS += --enable-iu --with-systemdsystemunitdir=/lib/systemd/system
|
||||
override_dh_auto_configure:
|
||||
dh_auto_configure -- $(CONFIGURE_FLAGS)
|
||||
#
|
||||
# Do not install libtool archive, python .pyc .pyo
|
||||
|
||||
@@ -1,3 +1,13 @@
|
||||
OSMOCONF_FILES = \
|
||||
osmo-gtphub/osmo-gtphub.cfg \
|
||||
osmo-sgsn/osmo-sgsn.cfg \
|
||||
osmo-gbproxy/osmo-gbproxy.cfg
|
||||
|
||||
osmoconfdir = $(sysconfdir)/osmocom
|
||||
osmoconf_DATA = $(OSMOCONF_FILES)
|
||||
|
||||
EXTRA_DIST = $(OSMOCONF_FILES)
|
||||
|
||||
CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,'
|
||||
|
||||
dist-hook:
|
||||
|
||||
Reference in New Issue
Block a user