Merge pull request #25 from opencrowbar/develop

Merge in fixes for building master
opencrowbar · Dec 8, 2014 · 209c72f · 209c72f
2 parents 4df2458 + 6995d7d
commit 209c72f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/bin/make-ocb-rpms.sh b/bin/make-ocb-rpms.sh
@@ -21,7 +21,7 @@ if [[ ! $OCBDIR ]]; then
 fi
 
 PRODREL=${PRODREL:-"Dev"}
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-2.1.0}
 RELEASE=${RELEASE:-1}
 WORK=${WORK:-/tmp/work}
 RPMHOME=${RPMHOME:-$HOME/rpmbuild}

diff --git a/bin/make-rpms.sh b/bin/make-rpms.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -e -x
 export PS4='${BASH_SOURCE}@${LINENO}(${FUNCNAME[0]}): '
 # Check that we are in the root of the opencrowbar checkout tree
 if [[ $0 = /* ]]; then
@@ -28,7 +28,8 @@ export OCBDIR="${OCBDIR%/build-tools/bin/${0##*/}}"
 
 # We do not want the raw_pkgs package info here.
 rm -f /etc/yum.repos.d/crowbar-raw_pkgs.repo || :
-yum -y install rpm-build createrepo git bsdtar
+yum -y downgrade libyaml # epel is messed up and missing libyaml-devel for 1.6
+yum -y install rpm-build createrepo git bsdtar libyaml-devel
 "$OCBDIR/build-tools/bin/make-ocb-rpms.sh"
 if [[ $1 = '--with-ruby' ]]; then
     yum -y install gdbm-devel db4-devel tk-devel systemtap-sdt-devel

diff --git a/bin/make-ruby-rpm.sh b/bin/make-ruby-rpm.sh
@@ -31,7 +31,7 @@
 # This script currently only allows building of ruby-2.0.0.
 ###
 
-set -e
+set -e -x
 
 # VARIABLES
 RPMBUILD=$HOME/rpmbuild