]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
nfs-ganesha: edit cmake command 611/head
authorAli Maredia <amaredia@redhat.com>
Fri, 6 Jan 2017 14:20:17 +0000 (19:50 +0530)
committerAli Maredia <amaredia@redhat.com>
Fri, 6 Jan 2017 14:27:55 +0000 (19:57 +0530)
Signed-off-by: Ali Maredia <amaredia@redhat.com>
nfs-ganesha/build/build_deb
nfs-ganesha/build/build_rpm

index b342b5b64d4ad90a61e931cd55d5903a3b215c75..dfe443eb6044fc04be83370c53b04fe25753fe60 100644 (file)
@@ -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)
index 89557860a58e28b10423ab18bbba0b40a1bc248f..b17dcb448c5ae945a5d2ac015874a5bf01dc96b8 100644 (file)
@@ -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)