holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Allow failed rpmbuild to be retried

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7239 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-08-28 14:14:17 +00:00
parent 33c1f18a03
commit ed60210070
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/build/buildshorewall
View File

@ -141,6 +141,22 @@ list_search() # $1 = element to search for , $2-$n = list
return 1 return 1
} }
do_rpmbuild() {
while ! rpmbuild $@ >> $LOGFILE 2>&1; do
echo -n "rpmbuild $@ failed -- Retry? Y/n "
read response
case $response in
Y*|y*)
;;
*)
[ -n "$response" ] && return 1
;;
esac
done
return 0
}
usage() usage()
{ {
echo "usage: $(basename $0) [ -trhxl] <version> [ <old-version> ]" echo "usage: $(basename $0) [ -trhxl] <version> [ <old-version> ]"
@ -472,7 +488,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
rm -rf $RPMDIR/BUILD/shorewall-${VERSION%-*} rm -rf $RPMDIR/BUILD/shorewall-${VERSION%-*}
do_or_die "cp shorewall-common-${VERSION%-*}.tgz $RPMDIR/SOURCES/" do_or_die "cp shorewall-common-${VERSION%-*}.tgz $RPMDIR/SOURCES/"
do_or_die "cp $SHOREWALLDIR/shorewall-common.spec $RPMDIR/SPECS/" do_or_die "cp $SHOREWALLDIR/shorewall-common.spec $RPMDIR/SPECS/"
do_or_die "rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-common.spec >> $LOGFILE 2>&1" do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-common.spec"
do_or_die cp -a $RPMDIR/RPMS/noarch/$RPMNAME . do_or_die cp -a $RPMDIR/RPMS/noarch/$RPMNAME .
progress_message "Building $LITERPMNAME..." progress_message "Building $LITERPMNAME..."
@ -480,7 +496,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
rm -rf $RPMDIR/BUILD/shorewall-${VERSION%-*} rm -rf $RPMDIR/BUILD/shorewall-${VERSION%-*}
do_or_die "cp shorewall-lite-${VERSION%-*}.tgz $RPMDIR/SOURCES/" do_or_die "cp shorewall-lite-${VERSION%-*}.tgz $RPMDIR/SOURCES/"
do_or_die "cp $SHOREWALLLITEDIR/shorewall-lite.spec $RPMDIR/SPECS/" do_or_die "cp $SHOREWALLLITEDIR/shorewall-lite.spec $RPMDIR/SPECS/"
do_or_die "rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-lite.spec >> $LOGFILE 2>&1" do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-lite.spec"
do_or_die cp -a $RPMDIR/RPMS/noarch/$LITERPMNAME . do_or_die cp -a $RPMDIR/RPMS/noarch/$LITERPMNAME .
progress_message "Building $PERLRPMNAME..." progress_message "Building $PERLRPMNAME..."
@ -488,7 +504,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
rm -rf $RPMDIR/BUILD/shorewall-perl-${VERSION%-*}* rm -rf $RPMDIR/BUILD/shorewall-perl-${VERSION%-*}*
do_or_die "cp shorewall-perl-${VERSION%-*}.tgz $RPMDIR/SOURCES/" do_or_die "cp shorewall-perl-${VERSION%-*}.tgz $RPMDIR/SOURCES/"
do_or_die "cp $PERLDIR/shorewall-perl.spec $RPMDIR/SPECS/" do_or_die "cp $PERLDIR/shorewall-perl.spec $RPMDIR/SPECS/"
do_or_die "rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-perl.spec >> $LOGFILE 2>&1" do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-perl.spec"
do_or_die cp -a $RPMDIR/RPMS/noarch/$PERLRPMNAME . do_or_die cp -a $RPMDIR/RPMS/noarch/$PERLRPMNAME .
progress_message "Building $SHELLRPMNAME..." progress_message "Building $SHELLRPMNAME..."
@ -496,7 +512,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
rm -rf $RPMDIR/BUILD/shorewall-shell-${VERSION%-*}* rm -rf $RPMDIR/BUILD/shorewall-shell-${VERSION%-*}*
do_or_die "cp shorewall-shell-${VERSION%-*}.tgz $RPMDIR/SOURCES/" do_or_die "cp shorewall-shell-${VERSION%-*}.tgz $RPMDIR/SOURCES/"
do_or_die "cp $SHELLDIR/shorewall-shell.spec $RPMDIR/SPECS/" do_or_die "cp $SHELLDIR/shorewall-shell.spec $RPMDIR/SPECS/"
do_or_die "rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-shell.spec >> $LOGFILE 2>&1" do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-shell.spec"
do_or_die cp -a $RPMDIR/RPMS/noarch/$SHELLRPMNAME . do_or_die cp -a $RPMDIR/RPMS/noarch/$SHELLRPMNAME .
fi fi
fi fi
@ -789,7 +805,7 @@ done
if [ -n "$OLDVERSION" ]; then if [ -n "$OLDVERSION" ]; then
progress_message "Creating patch-$VERSION ..." progress_message "Creating patch-$VERSION ..."
diff -Naur shorewall-common-$OLDVERSION shorewall-common-$VERSION > patch-$VERSION || true diff -Naur -X $(dirname $0)/exclude.txt shorewall-common-$OLDVERSION shorewall-common-$VERSION > patch-$VERSION || true
diff -Naur -X $(dirname $0)/exclude.txt shorewall-lite-$OLDVERSION shorewall-lite-$VERSION >> patch-$VERSION || true diff -Naur -X $(dirname $0)/exclude.txt shorewall-lite-$OLDVERSION shorewall-lite-$VERSION >> patch-$VERSION || true
diff -Naur -X $(dirname $0)/exclude.txt shorewall-perl-$OLDVERSION shorewall-perl-$VERSION >> patch-$VERSION || true diff -Naur -X $(dirname $0)/exclude.txt shorewall-perl-$OLDVERSION shorewall-perl-$VERSION >> patch-$VERSION || true
diff -Naur -X $(dirname $0)/exclude.txt shorewall-shell-$OLDVERSION shorewall-shell-$VERSION >> patch-$VERSION || true diff -Naur -X $(dirname $0)/exclude.txt shorewall-shell-$OLDVERSION shorewall-shell-$VERSION >> patch-$VERSION || true

3
tools/build/exclude.txt
View File

@ -1,2 +1,5 @@
releasenotes.txt releasenotes.txt
changelog.txt changelog.txt
*.5
*.8
diff*