Author: glen Date: Tue Apr 15 00:23:59 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- --target as first arg to rpm/rpmbuild (especially it should be before bconds
to have effect)
---- Files affected:
SPECS:
builder (1.552 -> 1.553)
---- Diffs:
================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.552 SPECS/builder:1.553
--- SPECS/builder:1.552 Tue Apr 15 02:17:33 2008
+++ SPECS/builder Tue Apr 15 02:23:53 2008
@@ -475,7 +475,7 @@
%_sourcedir ./
EOF
fi
- eval $RPMBUILD --macros "$safe_macrofiles:$BUILDER_MACROS" $QUIET
$RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $* 2>&1
+ eval $RPMBUILD $TARGET_SWITCH --macros
"$safe_macrofiles:$BUILDER_MACROS" $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $* 2>&1
}
cache_rpm_dump() {
@@ -486,7 +486,7 @@
if [ -x /usr/bin/rpm-specdump ]; then
update_shell_title "cache_rpm_dump using rpm-specdump command"
- rpm_dump_cache=$(rpm-specdump $BCOND $TARGET_SWITCH $SPECFILE)
+ rpm_dump_cache=$(rpm-specdump $TARGET_SWITCH $BCOND $SPECFILE)
else
update_shell_title "cache_rpm_dump using rpmbuild command"
local rpm_dump
@@ -1396,7 +1396,8 @@
fi
RES_FILE=$(mktemp -t builder.XXXXXX ||
${TMPDIR:-/tmp}/builder.$RANDOM)
- (time eval ${NICE_COMMAND} $RPMBUILD $BUILD_SWITCH -v $QUIET
$CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $SPECFILE; echo $? >
$RES_FILE) 2>&1 |tee $LOG
+ set -x
+ (time eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH
$BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND $SPECFILE; echo $?
> $RES_FILE) 2>&1 |tee $LOG
RETVAL=`cat $RES_FILE`
rm $RES_FILE
if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
@@ -1407,7 +1408,8 @@
fi
fi
else
- eval ${NICE_COMMAND} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN
$RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $SPECFILE
+ set -x
+ eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v
$QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND $SPECFILE
RETVAL=$?
fi
if [ "$RETVAL" -ne "0" ]; then
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/builder?r1=1.552&r2=1.553&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
