osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38056?usp=email )
Change subject: configure.ac: Remove ibosmo-sccp dependency ......................................................................
configure.ac: Remove ibosmo-sccp dependency
osmo-msc had probably forever contained a configure.ac dependency to libosmo-sccp (that's the old static library libsccp.a), which was only added to use a single header file (sccp_types.h). This file has recently been migrated to libosmo-sigtran, as libsccp.a has been removed.
Change-Id: Ifcdad8684614c95982b6b471a5585dd42a7fb897 --- M TODO-RELEASE M configure.ac M debian/control M doc/manuals/chapters/overview.adoc M src/libmsc/Makefile.am M src/libmsc/neighbor_ident.c M src/libsmpputil/Makefile.am M src/libvlr/Makefile.am M src/osmo-msc/msc_main.c M src/utils/Makefile.am M tests/smpp/Makefile.am 11 files changed, 8 insertions(+), 11 deletions(-)
Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified
diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..02843d4 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-sigtran bump dependency to > 1.9.0 / libosmo-sccp package removal diff --git a/configure.ac b/configure.ac index c0ab55e..49afb7b 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,6 @@ PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.6.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.5.0) PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.9.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.9.0) PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.13.0) PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.8.0)
diff --git a/debian/control b/debian/control index 76cfd7a..43a6334 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,6 @@ libsmpp34-dev (>= 1.14.0), libasn1c-dev (>= 0.9.30), libosmocore-dev (>= 1.10.0), - libosmo-sccp-dev (>= 1.9.0), libosmo-sigtran-dev (>= 1.9.0), libosmo-abis-dev (>= 1.6.0), libosmo-mgcp-client-dev (>= 1.13.0), diff --git a/doc/manuals/chapters/overview.adoc b/doc/manuals/chapters/overview.adoc index 0bb47d7..ab09022 100644 --- a/doc/manuals/chapters/overview.adoc +++ b/doc/manuals/chapters/overview.adoc @@ -42,7 +42,7 @@ had an SCCPlite based _A_ interface towards 3rd party MSC implementations. OsmoMSC features a true SCCP/M3UA _A_ interface, which allows running OsmoBSC against this Osmocom based MSC implementation. The new SCCP/M3UA SIGTRAN for - the _A_ interface is implemented in libosmo-sccp, which is used by OsmoMSC + the _A_ interface is implemented in libosmo-sigtran, which is used by OsmoMSC and OsmoBSC (and others), to establish a link via an STP (e.g. OsmoSTP).
- Addition of an _IuCS_ interface to allow operating 3G voice services, also diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index dff4b2d..3cda322 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -13,7 +13,6 @@ $(LIBSMPP34_CFLAGS) \ $(LIBASN1C_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ - $(LIBOSMOSCCP_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(LIBOSMOGSUPCLIENT_CFLAGS) \ $(LIBOSMORANAP_CFLAGS) \ diff --git a/src/libmsc/neighbor_ident.c b/src/libmsc/neighbor_ident.c index b3cdf17..e7d34fa 100644 --- a/src/libmsc/neighbor_ident.c +++ b/src/libmsc/neighbor_ident.c @@ -35,7 +35,7 @@ #include <osmocom/msc/sccp_ran.h> #include <osmocom/msc/cell_id_list.h>
-/* XXX greater than or equal to IPA_STRING_MAX (libosmocore) and MAX_PC_STR_LEN (libosmo-sccp). */ +/* XXX greater than or equal to IPA_STRING_MAX (libosmocore) and MAX_PC_STR_LEN (libosmo-sigtran). */ #define NEIGHBOR_IDENT_ADDR_STRING_MAX 64
static struct gsm_network *gsmnet; diff --git a/src/libsmpputil/Makefile.am b/src/libsmpputil/Makefile.am index b180ddf..ee1b790 100644 --- a/src/libsmpputil/Makefile.am +++ b/src/libsmpputil/Makefile.am @@ -3,7 +3,7 @@ -Wall \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ - $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ diff --git a/src/libvlr/Makefile.am b/src/libvlr/Makefile.am index 14cd302..49bf573 100644 --- a/src/libvlr/Makefile.am +++ b/src/libvlr/Makefile.am @@ -3,7 +3,7 @@ -Wall \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ - $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(LIBOSMOGSUPCLIENT_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 913bd21..a4b2ded 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -356,7 +356,7 @@
static int msc_vty_is_config_node(struct vty *vty, int node) { - /* Check if libosmo-sccp declares the node in + /* Check if libosmo-sigtran declares the node in * question as config node */ if (osmo_ss7_is_config_node(vty, node)) return 1; diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 6069672..335c950 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -34,7 +34,7 @@
smpp_mirror_CFLAGS = \ $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(LIBSMPP34_CFLAGS) \ $(NULL) diff --git a/tests/smpp/Makefile.am b/tests/smpp/Makefile.am index ff19d3d..8ad5967 100644 --- a/tests/smpp/Makefile.am +++ b/tests/smpp/Makefile.am @@ -9,9 +9,8 @@ -ggdb3 \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ - $(LIBOSMOSCCP_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(LIBSMPP34_CFLAGS) \
-
osmith