From e98a70274741efc33d7f997011ac18ed98e2a2ef Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Wed, 8 Dec 2021 09:11:19 +0100 Subject: [PATCH] rpmbuild: Fix cmdline lookup Fixes issue #2272 Signed-off-by: Michal Berger Change-Id: I8845e4cb194c00eaaaa5e2a6c799ca32ba4b9335 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10591 Reviewed-by: Reviewed-by: Dong Yi Reviewed-by: Changpeng Liu Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins --- rpmbuild/rpm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpmbuild/rpm.sh b/rpmbuild/rpm.sh index 9f1ec0401..1a39edf37 100755 --- a/rpmbuild/rpm.sh +++ b/rpmbuild/rpm.sh @@ -68,7 +68,7 @@ get_version() { build_rpm() ( local macros=() dir - macros+=(-D "configure $configure") + macros+=(-D "configure ${configure:-"%{nil}"}") macros+=(-D "make $make") macros+=(-D "release $release") macros+=(-D "version $version") @@ -128,7 +128,7 @@ build_rpm() ( ) # .spec defaults -configure=${*:-"%{nil}"} +configure=$* deps=${DEPS:-yes} make="${MAKEFLAGS:--j $(nproc)}" release=${RPM_RELEASE:-1}