summaryrefslogtreecommitdiff
path: root/Build-tools
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-10-10 13:59:47 +0300
committermonty@hundin.mysql.fi <>2001-10-10 13:59:47 +0300
commit440197b600deb223945088986a7dc340472a147d (patch)
tree547b73c73ddc34b0e32c6dc9a01f2e939e2c8121 /Build-tools
parent68832fa32301fedb2e691df62fc224f0accca050 (diff)
downloadmariadb-git-440197b600deb223945088986a7dc340472a147d.tar.gz
Fixes to get RPM done
Diffstat (limited to 'Build-tools')
-rwxr-xr-xBuild-tools/Do-rpm9
1 files changed, 7 insertions, 2 deletions
diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm
index 123f6332398..6ce8c9c3e45 100755
--- a/Build-tools/Do-rpm
+++ b/Build-tools/Do-rpm
@@ -115,7 +115,8 @@ set -x
rm -rf $rpmdir/BUILD/mysql-*
rm -f $rpmdir/SOURCES/mysql-*
rm -f $rpmdir/SRPMS/MySQL-*
-rm -f $rpmdir/SPEC/mysql-*
+rm -f $rpmdir/SPECS/mysql-*
+rm -rf /var/tmp/mysql
# Copy MySQL source and spec files
@@ -162,7 +163,7 @@ if [ ! x$skip_perl=x1 ]; then
set -x
# First clean up so we do not get old versions when wildcard matching
- rm -f $rpmdir/SOURCES/DBI-*.spec
+ rm -f $rpmdir/SOURCES/DBI-*.spec $rpmdir/SOURCES/mysql*
rm -f $rpmdir/RPMS/i386/Perl-*.rpm
rm -f $rpmdir/SRPMS/Perl-*.rpm
rm -f $rpmdir/RPMS/i386/MySQL*-$VER_NO_DASH*.rpm
@@ -232,5 +233,9 @@ if [ x$local_build != x1 ]; then
# And the perl ones
#scp $owner@$bmachine:$rpmdir/RPMS/i386/Perl*-*.rpm $bpath/NEW-RPMS
#scp $owner@$bmachine:$rpmdir/SRPMS/Perl*-*.rpm $bpath/NEW-RPMS
+
+ #Remove some of the files that can interfere with future builds
+
+ rm -rf /var/tmp/mysql
fi
) > $log 2>&1