SPECS: compile.sh - current builder script accepts -bc and --short...

glen glen at pld-linux.org
Tue Feb 5 18:30:46 CET 2008


Author: glen                         Date: Tue Feb  5 17:30:46 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- current builder script accepts -bc and --short-circuit

---- Files affected:
SPECS:
   compile.sh (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/compile.sh
diff -u SPECS/compile.sh:1.5 SPECS/compile.sh:1.6
--- SPECS/compile.sh:1.5	Tue Feb 13 19:39:07 2007
+++ SPECS/compile.sh	Tue Feb  5 18:30:41 2008
@@ -12,21 +12,5 @@
 #
 # -glen 2005-03-03
 
-set -e
-
-rpmbuild() {
-	set -x
-	/usr/bin/rpmbuild ${TARGET:+--target $TARGET} $BCONDS --short-circuit "$@" || exit
-}
-
-specfile="${1%.spec}.spec"; shift
-set -- "$specfile" "$@"
-
-tmp=$(awk '/^BuildArch:/ { print $NF}' $specfile)
-if [ "$tmp" ]; then
-	TARGET="$tmp"
-fi
-
-BCONDS=$(./builder -nn -ncs --show-bcond-args $specfile)
-
-rpmbuild -bc "$@"
+set -x
+exec ./builder --short-circuit -bc "$@"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/compile.sh?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list