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

More build/upload changes

Browse Source
This commit is contained in:
Tom Eastep 2009-07-25 10:19:29 -07:00
parent 2d45a35c8f
commit fdbd691a94
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/build/build44
View File

@ -48,6 +48,7 @@
# XSL Stylesheet to use for XML->HTML conversion # XSL Stylesheet to use for XML->HTML conversion
# #
STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
STYLESHEET=/usr/share/docbook-xsl/xhtml/docbook.xsl
# #
# Directory where the build log will be placed. The log has the name # Directory where the build log will be placed. The log has the name
# shorewall_build_<version>.log # shorewall_build_<version>.log
@ -166,7 +167,7 @@ list_search() # $1 = element to search for , $2-$n = list
# It's easy to mis-type the GPG passphrase; this function allows us additional chances to get it right # It's easy to mis-type the GPG passphrase; this function allows us additional chances to get it right
# #
do_rpmbuild() { do_rpmbuild() {
while ! rpmbuild $@ >> $LOGFILE 2>&1; do while ! rpmbuild --target noarch-linux $@ >> $LOGFILE 2>&1; do
echo "rpmbuild $@ failed" >&2 echo "rpmbuild $@ failed" >&2
echo -n "Retry? Y/n " >&2 echo -n "Retry? Y/n " >&2
read response read response
@ -276,7 +277,7 @@ case $1 in
BUILD6LITE=Yes BUILD6LITE=Yes
done=Yes done=Yes
SIGN=Yes SIGN=
;; ;;
esac esac

11
tools/build/upload44
View File

@ -181,4 +181,15 @@ base=
[ -n "$BASE" ] && $COMMAND $base $DEST/base [ -n "$BASE" ] && $COMMAND $base $DEST/base
rpms=$(
for f in $files; do
case $f in
*.rpm)
echo $f
;;
esac
done)
[ -n "$rpms" ] && rpm --resign $files
$COMMAND -r $files $DEST $COMMAND -r $files $DEST