From 7d2530b3a09c48df5070a9fbddb20dda9d6ba213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 24 Jun 2013 20:04:29 +0200 Subject: RPM Packaging: misc updates for 3.5.13.2 --- redhat/genrpm.sh | 136 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 91 insertions(+), 45 deletions(-) (limited to 'redhat/genrpm.sh') diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index df6362bc3..6dfe7d68c 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -3,10 +3,11 @@ cd "$( dirname "$0" )" ARGS="" -eval TARBALLS_DIR=~/tde/3.5.13.1 +eval TARBALLS_DIR=~/tde/tde-tarballs/3.5.13.2 +DIST="$(rpmdist.sh --dist)" +# CCACHE related stuff if [ ! -d /var/cache/ccache ]; then - DIST="$(rpmdist.sh --dist)" [ -z "${DIST}" ] && DIST="$(rpm -E "%{dist}")" if [ -n "${DIST}" ]; then export CCACHE_DIR=~/.ccache${DIST}.$(uname -m) @@ -14,20 +15,19 @@ if [ ! -d /var/cache/ccache ]; then fi while [ $# -gt 0 ]; do - case "$1" in - "--auto"|"-a") AUTO=1;; - "--version"|"-v") REQVERSION="$2"; shift;; - "--"*) ARGS="${ARGS} $1";; - *) COMP="${1%%/}";; - esac - shift + case "$1" in + "--auto"|"-a") AUTO=1;; + "--version"|"-v") REQVERSION="$2"; shift;; + "--"*) ARGS="${ARGS} $1";; + *) COMP="${1%%/}";; + esac + shift done clear cat <&1 | tee ${LOGFILE} -RET=$? +eval "$(grep ^RET= ${LOGFILE})" set +x -if [ ${RET} -gt 0 ]; then +if [ "${RET}" -gt 0 ]; then exit ${RET} fi @@ -158,4 +202,6 @@ if grep -q "error: Failed build dependencies:" ${LOGFILE}; then exit 2 fi +set -x rm -rf "${SOURCEDIR}" +#rm -rf "${BUILDDIR}/"*${COMP}-${VERSION}* -- cgit v1.2.1