From e6f6919d42440080ec58278d13a0536f97b78913 Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Tue, 2 May 2017 11:53:14 -0400 Subject: [PATCH] nfs-ganesha: set VERSION correctly in rpm builds $VERSION now set properly for "dev-X" & "rcX" versions in rpm builds of nfs-ganesha. Signed-off-by: Ali Maredia --- nfs-ganesha/build/build_rpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm index 8d381fbd..f591e771 100644 --- a/nfs-ganesha/build/build_rpm +++ b/nfs-ganesha/build/build_rpm @@ -92,7 +92,7 @@ echo "\"\"\"" >> nfs-ganesha.cfg echo "Building RPMs" sudo mock --verbose -r nfs-ganesha.cfg --define "dist .el7" --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 ) -VERSION=`grep -om 1 '[[:digit:]]\+\.[[:digit:]]\+-dev-[[:digit:]]\+' $WORKSPACE/nfs-ganesha/build/include/config.h` +VERSION=`grep -R "#define GANESHA_VERSION \"" $WORKSPACE/nfs-ganesha/build/include/config.h | sed -e 's/#define GANESHA_VERSION "//1; s/"//1;'` chacra_endpoint="nfs-ganesha/${NFS_GANESHA_BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}" chacra_repo_endpoint="${chacra_endpoint}/flavors/${FLAVOR}" RPM_RELEASE=`grep Release $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec | sed 's/Release:[ \t]*//g' | cut -d '%' -f 1` -- 2.39.5