extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-14 03:34:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

More duplicate code factoring

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9790 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-04-04 00:27:11 +00:00
parent 8dc6be749d
commit 278d3f6451
1 changed files with 17 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
tools/build/build44
View File

@ -183,6 +183,19 @@ do_rpmbuild() {
return 0
}
do_buildanrpm() {
progress_message "Building ${1}..."
cd /tmp
rm -rf ${1}-${BASEVERSION}
do_or_die "cp -a $DIR/$SHOREWALLDIR ${1}-${BASEVERSION}"
do_or_die "tar -zcf $RPMDIR/SOURCES/${2}-${BASEVERSION}.tgz ${2}-${BASEVERSION}"
cd $DIR
do_or_die "cp ${3}/${2}.spec $RPMDIR/SPECS/"
do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/${2}.spec"
do_or_die cp -a $RPMDIR/RPMS/noarch/${1} .
}
usage()
{
echo "usage: $(basename $0) [ -trhxlcpsS] <version> [ <old-version> ]"
@ -633,57 +646,10 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
if [ -n "$BUILDRPM" ]; then
test -n "$SIGN" && SIGN="--sign"
if [ -n "$BUILDCOMMON" ]; then
progress_message "Building $RPMNAME..."
cd /tmp
rm -rf shorewall-${BASEVERSION}
do_or_die "cp -a $DIR/$SHOREWALLDIR shorewall-${BASEVERSION}"
do_or_die "tar -zcf $RPMDIR/SOURCES/shorewall-${BASEVERSION}.tgz shorewall-${BASEVERSION}"
cd $DIR
do_or_die "cp $SHOREWALLDIR/shorewall.spec $RPMDIR/SPECS/"
do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall.spec"
do_or_die cp -a $RPMDIR/RPMS/noarch/$RPMNAME .
fi
if [ -n "$BUILD6" ]; then
progress_message "Building $RPM6NAME..."
cd /tmp
rm -rf shorewall6-${BASEVERSION}
do_or_die "cp -a $DIR/$SHOREWALL6DIR shorewall6-${BASEVERSION}"
do_or_die "tar -zcf $RPMDIR/SOURCES/shorewall6-${BASEVERSION}.tgz shorewall6-${BASEVERSION}"
cd $DIR
do_or_die "cp $SHOREWALL6DIR/shorewall6.spec $RPMDIR/SPECS/"
do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall6.spec"
do_or_die cp -a $RPMDIR/RPMS/noarch/$RPM6NAME .
fi
if [ -n "$BUILDLITE" ]; then
progress_message "Building $LITERPMNAME..."
cd /tmp
rm -rf shorewall-lite-${BASEVERSION}
do_or_die "cp -a $DIR/$SHOREWALLLITEDIR shorewall-lite-${BASEVERSION}"
do_or_die "tar -zcf $RPMDIR/SOURCES/shorewall-lite-${BASEVERSION}.tgz shorewall-lite-${BASEVERSION}"
cd $DIR
do_or_die "cp $SHOREWALLLITEDIR/shorewall-lite.spec $RPMDIR/SPECS/"
do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-lite.spec"
do_or_die cp -a $RPMDIR/RPMS/noarch/$LITERPMNAME .
fi
if [ -n "$BUILD6LITE" ]; then
progress_message "Building $LITE6RPMNAME..."
cd /tmp
rm -rf shorewall6-lite-${BASEVERSION}
do_or_die "cp -a $DIR/$LITE6DIR shorewall6-lite-${BASEVERSION}"
do_or_die "tar -zcf $RPMDIR/SOURCES/shorewall6-lite-${BASEVERSION}.tgz shorewall6-lite-${BASEVERSION}"
cd $DIR
do_or_die "cp $LITE6DIR/shorewall6-lite.spec $RPMDIR/SPECS/"
do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall6-lite.spec"
do_or_die cp -a $RPMDIR/RPMS/noarch/$LITE6RPMNAME .
fi
[ -n "$BUILDCOMMON" ] && do_buildanrpm $RPMNAME shorewall $SHOREWALLDIR
[ -n "$BUILD6" ] && do_buildanrpm $RPM6NAME shorewall6 $SHOREWALL6DIR
[ -n "$BUILDLITE" ] && do_buildanrpm $LITERPMNAME shorewall-lite $SHOREWALLLITEDIR
[ -n "$BUILD6LITE" ] && do_buildanrpm $LITE6RPMNAME shorewall6-lite $LITE6DIR
fi
fi