osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38057?usp=email )
Change subject: Remove dependency on libosmo-sccp ......................................................................
Remove dependency on libosmo-sccp
OsmoMSC already depends on and uses libosmo-sigtran. Remove the dependency on libosmo-sccp, which has been removed in the related commit.
Fix for: configure: error: Package requirements (libosmo-sccp >= 1.9.0) were not met:
Related: libosmo-sccp d258a59432364634d8cec1359ca821aae1950bcc Change-Id: I46d8e48aabca69cd0d10896da4be8d35d3cedbd8 --- M configure.ac M contrib/jenkins.sh M debian/control M doc/manuals/chapters/overview.adoc M src/libmsc/neighbor_ident.c M src/osmo-msc/msc_main.c 6 files changed, 3 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/38057/1
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/contrib/jenkins.sh b/contrib/jenkins.sh index c5161ef..74f9ee9 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -43,7 +43,6 @@
osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif -osmo-build-dep.sh libosmo-sccp osmo-build-dep.sh libsmpp34 osmo-build-dep.sh osmo-mgw osmo-build-dep.sh osmo-hlr 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/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/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;
-
osmith