ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpmbuild: Fix cmdline lookup

Browse Source 
Fixes issue #2272

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: I8845e4cb194c00eaaaa5e2a6c799ca32ba4b9335
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10591
Reviewed-by: <yex.chen@intel.com>
Reviewed-by: Dong Yi <dongx.yi@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Michal Berger 2021-12-08 09:11:19 +01:00 committed by Keith Lucas
parent bc1e8c5821
commit e98a702747
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpmbuild/rpm.sh
View File

@ -68,7 +68,7 @@ get_version() {
build_rpm() ( build_rpm() (
local macros=() dir local macros=() dir
macros+=(-D "configure $configure") macros+=(-D "configure ${configure:-"%{nil}"}")
macros+=(-D "make $make") macros+=(-D "make $make")
macros+=(-D "release $release") macros+=(-D "release $release")
macros+=(-D "version $version") macros+=(-D "version $version")
@ -128,7 +128,7 @@ build_rpm() (
) )
# .spec defaults # .spec defaults
configure=${*:-"%{nil}"} configure=$*
deps=${DEPS:-yes} deps=${DEPS:-yes}
make="${MAKEFLAGS:--j $(nproc)}" make="${MAKEFLAGS:--j $(nproc)}"
release=${RPM_RELEASE:-1} release=${RPM_RELEASE:-1}