aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@protonmail.com>2023-12-21 09:51:53 -0500
committerLibravatar GitHub <noreply@github.com>2023-12-21 09:51:53 -0500
commita0b5dc486774958052d1a28793f53b6e6b2351b8 (patch)
tree1d0346897321d03049b6b80903db3e1246e281ef
parentMerge pull request #6125 from kmk3/landlock-enforce (diff)
parentbuild: mkrpm.sh: append instead of override configure args (diff)
downloadfirejail-a0b5dc486774958052d1a28793f53b6e6b2351b8.tar.gz
firejail-a0b5dc486774958052d1a28793f53b6e6b2351b8.tar.zst
firejail-a0b5dc486774958052d1a28793f53b6e6b2351b8.zip
Merge pull request #6126 from kmk3/build-mkrpm-append-args
build: mkrpm.sh: append instead of override configure args
-rwxr-xr-xplatform/rpm/mkrpm.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/platform/rpm/mkrpm.sh b/platform/rpm/mkrpm.sh
index 0572480c6..f32f4b7de 100755
--- a/platform/rpm/mkrpm.sh
+++ b/platform/rpm/mkrpm.sh
@@ -14,7 +14,7 @@
14name="$TARNAME" 14name="$TARNAME"
15# Strip any trailing prefix from the version like -rc1 etc 15# Strip any trailing prefix from the version like -rc1 etc
16version="$(printf '%s\n' "$VERSION" | sed 's/\-.*//g')" 16version="$(printf '%s\n' "$VERSION" | sed 's/\-.*//g')"
17config_opt="$*" 17config_opt="--disable-userns --disable-contrib-install $*"
18 18
19if [[ ! -f "platform/rpm/${name}.spec" ]]; then 19if [[ ! -f "platform/rpm/${name}.spec" ]]; then
20 printf 'error: spec file not found for name %s\n' "${name}" >&2 20 printf 'error: spec file not found for name %s\n' "${name}" >&2
@@ -26,10 +26,6 @@ if [[ -z "${version}" ]]; then
26 exit 1 26 exit 1
27fi 27fi
28 28
29if [[ -z "${config_opt}" ]]; then
30 config_opt="--disable-userns --disable-contrib-install"
31fi
32
33# Make a temporary directory and arrange to clean up on exit 29# Make a temporary directory and arrange to clean up on exit
34tmpdir="$(mktemp -d)" 30tmpdir="$(mktemp -d)"
35mkdir -p "${tmpdir}"/{BUILD,RPMS,SOURCES,SPECS,SRPMS} 31mkdir -p "${tmpdir}"/{BUILD,RPMS,SOURCES,SPECS,SRPMS}