Change in osmo-upf[master]: add netfilter deps: libnftnl, libnftables

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28387 ) Change subject: add netfilter deps: libnftnl, libnftables ...................................................................... add netfilter deps: libnftnl, libnftables Will be used by subsequent patch to implement GTP tunnel mapping via netfilter. Related: SYS#5599 Change-Id: Ia8be861fe1303e82e57fe83a50cfa4ff0280db02 --- M configure.ac M contrib/jenkins.sh M src/osmo-upf/Makefile.am 3 files changed, 32 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 119aa6c..fea27c6 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,8 @@ PKG_CHECK_MODULES(LIBOSMOGTLV, libosmo-gtlv >= 0.1.0) PKG_CHECK_MODULES(LIBOSMOPFCP, libosmo-pfcp >= 0.1.0) PKG_CHECK_MODULES(LIBGTPNL, libgtpnl >= 1.2.0) +PKG_CHECK_MODULES(LIBNFTNL, libnftnl >= 1.2.1) +PKG_CHECK_MODULES(LIBNFTABLES, libnftables >= 1.0.2) dnl checks for header files AC_HEADER_STDC diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 253d0b8..beb74dc 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -33,6 +33,30 @@ osmo-build-dep.sh libosmo-pfcp osmo-build-dep.sh libgtpnl +# build libnftnl and libnftables from git.netfilter.org +build_from_netfilter() { +### TODO: enable osmo-build-dep.sh to build from git.netfilter.org URL? + project="$1" + set +x + echo + echo + echo + echo " =============================== $project ===============================" + echo + set -x + if [ -d "./$project" ]; then + rm -rf "./$project" + fi + git clone "git://git.netfilter.org/$project" "$project" + cd "$project" + autoreconf --install --force + ./configure --prefix="$inst/stow/$project" --without-cli --disable-man-doc + $MAKE install + STOW_DIR="$inst/stow" stow --restow $project +} +build_from_netfilter libnftnl +build_from_netfilter nftables + # Additional configure options and depends CONFIG="" if [ "$WITH_MANUALS" = "1" ]; then diff --git a/src/osmo-upf/Makefile.am b/src/osmo-upf/Makefile.am index d8aa5a0..37a8543 100644 --- a/src/osmo-upf/Makefile.am +++ b/src/osmo-upf/Makefile.am @@ -13,11 +13,15 @@ $(LIBOSMOGTLV_CFLAGS) \ $(LIBOSMOPFCP_CFLAGS) \ $(LIBGTPNL_CFLAGS) \ + $(LIBNFTNL_CFLAGS) \ + $(LIBNFTABLES_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) AM_LDFLAGS = \ $(LIBGTPNL_LDFLAGS) \ + $(LIBNFTNL_LDFLAGS) \ + $(LIBNFTABLES_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(NULL) @@ -43,5 +47,7 @@ $(LIBOSMOGTLV_LIBS) \ $(LIBOSMOPFCP_LIBS) \ $(LIBGTPNL_LIBS) \ + $(LIBNFTNL_LIBS) \ + $(LIBNFTABLES_LIBS) \ $(COVERAGE_LDFLAGS) \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ia8be861fe1303e82e57fe83a50cfa4ff0280db02 Gerrit-Change-Number: 28387 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged