Skip to content

Commit

Permalink
build: mkrpm.sh: append instead of override configure args
Browse files Browse the repository at this point in the history
For consistency with mkdeb.sh.

Note: The default arguments and support for argument overriding was
added to to mkrpm.sh on commit 3d97332 ("Add configure options when
building rpm (netblue30#3422)", 2020-05-19).

The support for appending arguments was added to mkdeb.sh on commit
9a0fbbd ("mkdeb.sh.in: pass remaining arguments to ./configure",
2022-05-13) / PR netblue30#5154.
  • Loading branch information
kmk3 committed Dec 13, 2023
1 parent d44be8e commit 8fd9ab0
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions platform/rpm/mkrpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
name="$TARNAME"
# Strip any trailing prefix from the version like -rc1 etc
version="$(printf '%s\n' "$VERSION" | sed 's/\-.*//g')"
config_opt="$*"
config_opt="--disable-userns --disable-contrib-install $*"

if [[ ! -f "platform/rpm/${name}.spec" ]]; then
printf 'error: spec file not found for name %s\n' "${name}" >&2
Expand All @@ -26,10 +26,6 @@ if [[ -z "${version}" ]]; then
exit 1
fi

if [[ -z "${config_opt}" ]]; then
config_opt="--disable-userns --disable-contrib-install"
fi

# Make a temporary directory and arrange to clean up on exit
tmpdir="$(mktemp -d)"
mkdir -p "${tmpdir}"/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
Expand Down

0 comments on commit 8fd9ab0

Please sign in to comment.