From d8b71492928238ae7dcf3323ebf5af09c80ce7ca Mon Sep 17 00:00:00 2001 From: Shlomi Livne Date: Mon, 12 Oct 2015 23:39:47 +0300 Subject: [PATCH] dist: update rpm build to support centos as well Signed-off-by: Shlomi Livne Signed-off-by: Pekka Enberg --- dist/redhat/build_rpm.sh | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dist/redhat/build_rpm.sh b/dist/redhat/build_rpm.sh index 63b7df1..21c1d21 100755 --- a/dist/redhat/build_rpm.sh +++ b/dist/redhat/build_rpm.sh @@ -1,14 +1,21 @@ #!/bin/sh -e -RPMBUILD=build/rpmbuild +RPMBUILD=`pwd`/build/rpmbuild if [ ! -e dist/redhat/build_rpm.sh ]; then echo "run build_rpm.sh in top of scylla-jmx dir" exit 1 fi -if [ ! -f /usr/bin/git ] || [ ! -f /usr/bin/mock ] || [ ! -f /usr/bin/rpmbuild ]; then - sudo yum install -y git mock rpm-build + +sudo yum install -y rpm-build git + +OS=`awk '{print $1}' /etc/redhat-release` +if [ "$OS" = "Fedora" ] && [ ! -f /usr/bin/mock ]; then + sudo yum -y install mock +elif [ "$OS" = "CentOS" ] && [ ! -f /usr/bin/yum-builddep ]; then + sudo yum -y install yum-utils fi + VERSION=$(./SCYLLA-VERSION-GEN) SCYLLA_VERSION=$(cat build/SCYLLA-VERSION-FILE) SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE) @@ -17,5 +24,11 @@ git archive --format=tar --prefix=scylla-jmx-$SCYLLA_VERSION/ HEAD -o build/rpmb cp dist/redhat/scylla-jmx.spec.in $RPMBUILD/SPECS/scylla-jmx.spec sed -i -e "s/@@VERSION@@/$SCYLLA_VERSION/g" $RPMBUILD/SPECS/scylla-jmx.spec sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" $RPMBUILD/SPECS/scylla-jmx.spec -rpmbuild -bs --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/scylla-jmx.spec -/usr/bin/mock rebuild --resultdir=`pwd`/build/rpms $RPMBUILD/SRPMS/scylla-jmx-$VERSION*.src.rpm + +if [ "$OS" = "Fedora" ]; then + rpmbuild -bs --define "_topdir $RPMBUILD" $RPMBUILD/SPECS/scylla-jmx.spec + /usr/bin/mock rebuild --resultdir=`pwd`/build/rpms $RPMBUILD/SRPMS/scylla-jmx-$VERSION*.src.rpm +else + sudo yum-builddep -y $RPMBUILD/SPECS/scylla-jmx.spec + rpmbuild -ba --define "_topdir $RPMBUILD" $RPMBUILD/SPECS/scylla-jmx.spec +fi