extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-28 02:23:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for partial builds/uploads

Browse Source
This commit is contained in:
Tom Eastep 2009-08-13 15:28:31 -07:00
parent 7211569197
commit 09b9bfa914
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/build/stage44
View File

@ -129,6 +129,16 @@ case $1 in
lite6rpm=shorewall6-lite-${1%-*}-0${1#*-}.noarch.rpm lite6rpm=shorewall6-lite-${1%-*}-0${1#*-}.noarch.rpm
BASE=Yes BASE=Yes
;; ;;
4.4.*.*)
BASEVERSION=${1%.*}
PATCHNUM=${1##*.}
DEST="/srv/ftp/pub/shorewall/${BASEVERSION%.*}/shorewall-${BASEVERSION}"
SHOREWALL=shorewall
rpm=shorewall-${BASEVERSION}-${PATCHNUM}.noarch.rpm
rpm6=shorewall6-${BASEVERSION}-${PATCHNUM}.noarch.rpm
literpm=shorewall-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm
lite6rpm=shorewall6-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm
;;
4.4.*) 4.4.*)
DEST="/srv/ftp/pub/private/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/private/${1%.*}/shorewall-$1"
SHOREWALL=shorewall SHOREWALL=shorewall
@ -155,9 +165,7 @@ fi
[ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt [ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt
[ -n "$PARTIAL" -a -z "$STAGECOMMON" ] && SHOREWALLDIR=shorewall || SHOREWALLDIR=$SHOREWALL-${1} cp $SHOREWALL-${1}/releasenotes.txt releasenotes.txt
cp $SHOREWALLDIR/releasenotes.txt releasenotes.txt
if [ "$HOSTNAME" = lists ]; then if [ "$HOSTNAME" = lists ]; then
mkdir -p $DEST mkdir -p $DEST
@ -169,7 +177,7 @@ else
DEST=${USER}:${DEST} DEST=${USER}:${DEST}
fi fi
files="errata known_problems.txt releasenotes.txt patch-*-$1 ${1}.*" files="errata known_problems.txt releasenotes.txt patch*-$1 ${1}.*"
base= base=
rm -f *-${1}*.asc rm -f *-${1}*.asc

2
tools/build/upload44
View File

@ -165,7 +165,7 @@ fi
[ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt [ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt
cp $SHOREWALLDIR-${1}/releasenotes.txt releasenotes.txt cp $SHOREWALL-${1}/releasenotes.txt releasenotes.txt
if [ "$HOSTNAME" = lists ]; then if [ "$HOSTNAME" = lists ]; then
mkdir -p $DEST mkdir -p $DEST