andreacavalli/scylla-jmx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

default to our in-tree mock config when building on CentOS

Browse Source 
scylla.git does a similar thing, albeit in a more complicated fashion,
testing for whether or not a rebuild is asked for and etc.

For us, the build process is a lot simpler, so it is better to just
point to the file when we detect that we are on CentOS and no explicit
target is given.

Signed-off-by: Glauber Costa <glauber@scylladb.com>
This commit is contained in:
Glauber Costa 2017-07-27 16:00:45 +00:00
parent 7416bc79cf
commit 566a4f2639
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/redhat/build_rpm.sh vendored
View File

@ -43,7 +43,7 @@ if [ "$(arch)" != "x86_64" ]; then
fi fi
if [ -z "$TARGET" ]; then if [ -z "$TARGET" ]; then
if [ "$ID" = "centos" -o "$ID" = "rhel" ] && [ "$VERSION_ID" = "7" ]; then if [ "$ID" = "centos" -o "$ID" = "rhel" ] && [ "$VERSION_ID" = "7" ]; then
TARGET=epel-7-x86_64 TARGET=./dist/redhat/mock/scylla-jmx-epel-7-x86_64.cfg
elif [ "$ID" = "fedora" ]; then elif [ "$ID" = "fedora" ]; then
TARGET=$ID-$VERSION_ID-x86_64 TARGET=$ID-$VERSION_ID-x86_64
else else