Merge pull request #6126 from kmk3/build-mkrpm-append-args

build: mkrpm.sh: append instead of override configure args

Author: netblue30

platform/rpm/mkrpm.sh

@@ -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
@@ -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}