diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-12-13 00:54:24 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-12-13 01:15:04 -0300 |
commit | 8fd9ab03d662a0bdca7cf2435a25fbc82f36adb0 (patch) | |
tree | 980c152e1f9e3969f242c57448e0e987594c294c /platform | |
parent | landlock: use uint32_t instead of __u32 in firejail.h (diff) | |
download | firejail-8fd9ab03d662a0bdca7cf2435a25fbc82f36adb0.tar.gz firejail-8fd9ab03d662a0bdca7cf2435a25fbc82f36adb0.tar.zst firejail-8fd9ab03d662a0bdca7cf2435a25fbc82f36adb0.zip |
build: mkrpm.sh: append instead of override configure args
For consistency with mkdeb.sh.
Note: The default arguments and support for argument overriding was
added to to mkrpm.sh on commit 3d97332fd ("Add configure options when
building rpm (#3422)", 2020-05-19).
The support for appending arguments was added to mkdeb.sh on commit
9a0fbbd71 ("mkdeb.sh.in: pass remaining arguments to ./configure",
2022-05-13) / PR #5154.
Diffstat (limited to 'platform')
-rwxr-xr-x | platform/rpm/mkrpm.sh | 6 |
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 @@ | |||
14 | name="$TARNAME" | 14 | name="$TARNAME" |
15 | # Strip any trailing prefix from the version like -rc1 etc | 15 | # Strip any trailing prefix from the version like -rc1 etc |
16 | version="$(printf '%s\n' "$VERSION" | sed 's/\-.*//g')" | 16 | version="$(printf '%s\n' "$VERSION" | sed 's/\-.*//g')" |
17 | config_opt="$*" | 17 | config_opt="--disable-userns --disable-contrib-install $*" |
18 | 18 | ||
19 | if [[ ! -f "platform/rpm/${name}.spec" ]]; then | 19 | if [[ ! -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 |
27 | fi | 27 | fi |
28 | 28 | ||
29 | if [[ -z "${config_opt}" ]]; then | ||
30 | config_opt="--disable-userns --disable-contrib-install" | ||
31 | fi | ||
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 |
34 | tmpdir="$(mktemp -d)" | 30 | tmpdir="$(mktemp -d)" |
35 | mkdir -p "${tmpdir}"/{BUILD,RPMS,SOURCES,SPECS,SRPMS} | 31 | mkdir -p "${tmpdir}"/{BUILD,RPMS,SOURCES,SPECS,SRPMS} |