fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-upf/+/40896?usp=email )
Change subject: contrib/jenkins.sh: specify --with-unitdir for nftables
......................................................................
contrib/jenkins.sh: specify --with-unitdir for nftables
Since recently (see the related commit), libnftables installs
a systemd unit file that loads a ruleset from a file on boot.
contrib/jenkins.sh currently fails with the following error:
/usr/bin/install: cannot create regular file
'/lib/systemd/system/nftables.service':
Permission denied
Let's specify the unit directory like we do for other projects.
Change-Id: I9ab473dd6f734606518a980152fd4b00c2e23690
Related: nftables.git c4b17cf8305108f91d8e63880317a59e8e806c80
---
M contrib/jenkins.sh
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, approved
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 807774a..b81d1a6 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -37,6 +37,7 @@
build_from_netfilter() {
### TODO: enable osmo-build-dep.sh to build from git.netfilter.org URL?
project="$1"
+ cfg="$2"
set +x
echo
echo
@@ -54,12 +55,13 @@
--prefix="$inst/stow/$project" \
--without-cli \
--disable-man-doc \
- --enable-python=no
+ --enable-python=no \
+ $cfg
$MAKE $PARALLEL_MAKE install
STOW_DIR="$inst/stow" stow --restow $project
}
build_from_netfilter libnftnl
-build_from_netfilter nftables
+build_from_netfilter nftables
"--with-unitdir=$inst/stow/$project/lib/systemd/system"
# Additional configure options and depends
CONFIG=""
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/40896?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I9ab473dd6f734606518a980152fd4b00c2e23690
Gerrit-Change-Number: 40896
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
