fixeria submitted this change.

View Change

contrib/jenkins.sh: use Gitea mirrors for libnftnl and nftables

Change-Id: I28950d823dfd91e8e2ac23a19e5a86d1027096b3
Depends: osmo-ci.git I830a16c8bf7f595b16113bf2ba5e81bae56533dd
---
M contrib/jenkins.sh
1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 002bdc4..72671f2 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -32,36 +32,9 @@
 osmo-build-dep.sh libosmocore "" --disable-doxygen
 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"
-	cfg="$2"
-	set +x
-	echo
-	echo
-	echo
-	echo " =============================== $project ==============================="
-	echo
-	set -x
-	if [ -d "./$project" ]; then
-		rm -rf "./$project"
-	fi
-	git clone "https://git.netfilter.org/$project" "$project"
-	cd "$project"
-	autoreconf --install --force
-	./configure \
-		--prefix="$inst/stow/$project" \
-		--without-cli \
-		--disable-man-doc \
-		--enable-python=no \
-		$cfg
-	$MAKE $PARALLEL_MAKE install
-	STOW_DIR="$inst/stow" stow --restow $project
-}
-build_from_netfilter libnftnl
-build_from_netfilter nftables "--with-unitdir=$inst/stow/$project/lib/systemd/system"
+osmo-build-dep.sh libnftnl
+osmo-build-dep.sh nftables "" \
+	"--with-unitdir=$inst/stow/$project/lib/systemd/system --without-cli --disable-man-doc"
 
 # Additional configure options and depends
 CONFIG=""

To view, visit change 42613. To unsubscribe, or for help writing mail filters, visit settings.