fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37792?usp=email ) Change subject: build: remove indirect libosmo-netif dependency ...................................................................... build: remove indirect libosmo-netif dependency Neither we include its headers nor call any of its functions. It's actually a dependency of libosmo-sccp, which is required for '--enable-iu', so keep it in contrib/jenkins.sh. Change-Id: Ia3395fd335d3a693c314b29b8e92968eef55da9a Related: OS#6535 --- M configure.ac M contrib/jenkins.sh M debian/control 3 files changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/configure.ac b/configure.ac index 7e318aa..5286d2e 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,6 @@ PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.10.0) PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.10.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.6.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.5.0) PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.8.0) PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.12.0) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 321beef..8db3a70 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -33,11 +33,11 @@ export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmo-abis -osmo-build-dep.sh libosmo-netif osmo-build-dep.sh osmo-ggsn osmo-build-dep.sh osmo-hlr if [ "x$IU" = "x--enable-iu" ]; then + osmo-build-dep.sh libosmo-netif osmo-build-dep.sh libosmo-sccp osmo-build-dep.sh libasn1c #osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh diff --git a/debian/control b/debian/control index c9c224b..a5c0c6e 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ libgtp-dev (>= 1.12.0), libosmocore-dev (>= 1.10.0), libosmo-abis-dev (>= 1.6.0), - libosmo-netif-dev (>= 1.5.0), libosmo-gsup-client-dev (>= 1.8.0), libasn1c-dev (>= 0.9.30), libosmo-ranap-dev (>= 1.6.0), -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37792?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia3395fd335d3a693c314b29b8e92968eef55da9a Gerrit-Change-Number: 37792 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>