From: Ali Maredia <amaredia@redhat.com>
Date: Fri, 6 Jan 2017 14:20:17 +0000 (+0530)
Subject: nfs-ganesha: edit cmake command
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=92c8a252340aff5800068f5754d5f81cb24099ea;p=ceph-build.git

nfs-ganesha: edit cmake command

Signed-off-by: Ali Maredia <amaredia@redhat.com>
---

diff --git a/nfs-ganesha/build/build_deb b/nfs-ganesha/build/build_deb
index b342b5b6..dfe443eb 100644
--- a/nfs-ganesha/build/build_deb
+++ b/nfs-ganesha/build/build_deb
@@ -29,7 +29,7 @@ mkdir build
 cd build
 
 # make source tarball
-cmake -DCMAKE_BUILDER_TYPE=Maintainer -DUSE_FSAL_RGW=YES -DUSE_FSAL_CEPH=YES $WORKSPACE/nfs-ganesha/src && make dist || exit 0
+cmake -DCMAKE_BUILD_TYPE=Maintainer $WORKSPACE/nfs-ganesha/src && make dist || exit 0
 
 ## Get some basic information about the system and the repository
 DEB_ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm
index 89557860..b17dcb44 100644
--- a/nfs-ganesha/build/build_rpm
+++ b/nfs-ganesha/build/build_rpm
@@ -36,16 +36,16 @@ mkdir build
 cd build
 
 # generate .spec file and make source tarball
-cmake -DCMAKE_BUILDER_TYPE=Maintainer -DUSE_FSAL_RGW=YES -DUSE_FSAL_CEPH=YES $WORKSPACE/nfs-ganesha/src && make dist || exit 0
+cmake -DCMAKE_BUILD_TYPE=Maintainer $WORKSPACE/nfs-ganesha/src && make dist || exit 0
 
 ## Create the source rpm
 echo "Building SRPM"
 rpmbuild \
-    --define "_sourcedir $WORKSPACE/dist" \
-    --define "_specdir ." \
-    --define "_builddir ." \
-    --define "_srcrpmdir ." \
-    --define "_rpmdir ." \
+    --define "_sourcedir ." \
+    --define "_specdir $WORKSPACE/dist" \
+    --define "_builddir $WORKSPACE/dist" \
+    --define "_srcrpmdir $WORKSPACE/dist" \
+    --define "_rpmdir $WORKSPACE/dist" \
     --nodeps -bs $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec
 SRPM=$(readlink -f *.src.rpm)