From e38d9ec2d17445eda18f3bf37ed3f8ddfc0b2354 Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Fri, 16 Feb 2018 14:33:38 -0500 Subject: [PATCH] nfs-ganesha: change CMAKE_BUILD_TYPE to Maintainer Add yum clean --all before yum install Signed-off-by: Ali Maredia --- nfs-ganesha-stable/build/build_rpm | 7 +++++-- nfs-ganesha/build/build_rpm | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nfs-ganesha-stable/build/build_rpm b/nfs-ganesha-stable/build/build_rpm index a0eaa87c2..48a1f4e86 100644 --- a/nfs-ganesha-stable/build/build_rpm +++ b/nfs-ganesha-stable/build/build_rpm @@ -12,6 +12,9 @@ RELEASE="$(lsb_release --short -r | cut -d '.' -f 1)" # sytem release # Make sure old rpms are not leftover on the system sudo yum remove -y librados2 librgw2 libcephfs2 librados-devel librgw-devel libcephfs-devel +# Make sure old repo metadata are not leftover on the system +sudo yum clean all + # Get .repo file from appropriate shaman build REPO_URL="https://shaman.ceph.com/api/repos/ceph/$CEPH_BRANCH/$CEPH_SHA1/$DISTRO/$RELEASE/flavors/default/repo" TIME_LIMIT=1200 @@ -71,11 +74,11 @@ mkdir build cd build # generate .spec file, edit .spec file for correct versions of libs and make source tarball -cmake -DCMAKE_BUILD_TYPE=Release -DUSE_FSAL_GLUSTER=OFF -DUSE_FSAL_CEPH=ON -DUSE_FSAL_RGW=ON -DRADOS_URLS=ON -DUSE_RADOS_RECOV=ON $WORKSPACE/nfs-ganesha/src && make dist || exit 1 +cmake -DCMAKE_BUILD_TYPE=Maintainer -DUSE_FSAL_GLUSTER=OFF -DUSE_FSAL_CEPH=ON -DUSE_FSAL_RGW=ON -DRADOS_URLS=ON -DUSE_RADOS_RECOV=ON $WORKSPACE/nfs-ganesha/src && make dist || exit 1 sed -i 's/libcephfs1-devel/libcephfs-devel/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec sed -i 's/librgw2-devel/librgw-devel/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec -sed -i 's/CMAKE_BUILD_TPYE=Debug/CMAKE_BUILD_TYPE=Release/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec +sed -i 's/CMAKE_BUILD_TPYE=Debug/CMAKE_BUILD_TYPE=Maintainer/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec ## Create the source rpm echo "Building SRPM" diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm index ff15ee00f..ac3f8f486 100644 --- a/nfs-ganesha/build/build_rpm +++ b/nfs-ganesha/build/build_rpm @@ -72,6 +72,7 @@ cmake -DCMAKE_BUILD_TYPE=Maintainer -DUSE_FSAL_GLUSTER=OFF -DUSE_FSAL_CEPH=ON -D sed -i 's/libcephfs1-devel/libcephfs-devel/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec sed -i 's/librgw2-devel/librgw-devel/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec +sed -i 's/CMAKE_BUILD_TPYE=Debug/CMAKE_BUILD_TYPE=Maintainer/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec ## Create the source rpm echo "Building SRPM" -- 2.47.3