Author: benm
Date: 2005-04-26 20:48:35 -0400 (Tue, 26 Apr 2005)
New Revision: 43635
Modified:
trunk/release/packaging/build
trunk/release/packaging/do-build
trunk/release/packaging/shared-code.sh
trunk/release/website/mk-index.sh
Log:
cleanups
Modified: trunk/release/packaging/build
===================================================================
--- trunk/release/packaging/build 2005-04-27 00:06:38 UTC (rev 43634)
+++ trunk/release/packaging/build 2005-04-27 00:48:35 UTC (rev 43635)
@@ -43,21 +43,22 @@
if [ ! [EMAIL PROTECTED] -eq 0 ]; then
if ! ./install-deps $distro [EMAIL PROTECTED] >> $LOGFILE 2>&1; then
- echo Dependency installation, see log in $LOGFILE for details
+ echo Dependency installation failed, see log in $LOGFILE for
details
exit 1
fi
fi
scp do-build ../conf/$package/ximian-build.conf
sources/$package/*-$version.tar.gz $target_host:$jaildir/tmp
-(echo > status/$distro; ./jail-do $distro sh -x /tmp/do-build $version >>
$LOGFILE 2>&1; rm status/$distro)
-
-scp $target_host:$jaildir/tmp/status /tmp/status-$distro-$package
-if grep -q failure /tmp/status-$distro-$package; then
- echo Build failed, see log in $LOGFILE for details
- exit 1;
+echo > status/$distro;
+if ! ./jail-do $distro sh -x /tmp/do-build $version >> $LOGFILE 2>&1; then
+ rm status/$distro
+ echo Build failed, see log in $LOGFILE for details
+ exit 1;
fi
+rm status/$distro
+
distro_info $distro
get_destroot $distro
@@ -65,6 +66,6 @@
scp $target_host:$jaildir/tmp/root/built-packages/*
packages/$DEST_ROOT/$package
one_rpm=`ls -1 packages/$DEST_ROOT/$package/*.rpm | head -n1`
-ver=`rpm -qp --queryformat '%{VERSION}' $one_rpm 2>/dev/null`
+ver=`rpm_query VERSION $one_rpm`
mkdir -p packages/$DEST_ROOT/$package/$ver
mv packages/$DEST_ROOT/$package/*.rpm packages/$DEST_ROOT/$package/$ver
\ No newline at end of file
Modified: trunk/release/packaging/do-build
===================================================================
--- trunk/release/packaging/do-build 2005-04-27 00:06:38 UTC (rev 43634)
+++ trunk/release/packaging/do-build 2005-04-27 00:48:35 UTC (rev 43635)
@@ -2,8 +2,6 @@
version=$1
-echo failure > /tmp/status
-
rm -rf /tmp/root/built-packages || exit 1
cd /tmp && rm -rf scratch && mkdir scratch && cd scratch || exit 1
@@ -19,6 +17,4 @@
bb_do $VERSION_STRING || exit 1
bb_lint $VERSION_STRING || exit 1
-rm -rf /tmp/root/built-packages/*.src.rpm
-
-echo success > /tmp/status
\ No newline at end of file
+rm -rf /tmp/root/built-packages/*.src.rpm
\ No newline at end of file
Modified: trunk/release/packaging/shared-code.sh
===================================================================
--- trunk/release/packaging/shared-code.sh 2005-04-27 00:06:38 UTC (rev
43634)
+++ trunk/release/packaging/shared-code.sh 2005-04-27 00:48:35 UTC (rev
43635)
@@ -48,4 +48,9 @@
{
LATEST_VERSION=`ls -d -t -1 $* | head -n1 2> /dev/null`
[ ! "x$LATEST_VERSION" == x ]
-}
\ No newline at end of file
+}
+
+function rpm_query ()
+{
+ rpm -qp --queryformat "%{$1}" $2 2>/dev/null
+}
Modified: trunk/release/website/mk-index.sh
===================================================================
--- trunk/release/website/mk-index.sh 2005-04-27 00:06:38 UTC (rev 43634)
+++ trunk/release/website/mk-index.sh 2005-04-27 00:48:35 UTC (rev 43635)
@@ -55,8 +55,8 @@
echo "<ul>" >> $OUT
for i in [EMAIL PROTECTED]; do
- NAME=$(rpm -qp --queryformat '%{NAME}' $i
2>/dev/null)
- DESC=$(rpm -qp --queryformat '%{SUMMARY}' $i
2>/dev/null)
+ NAME=$(rpm_query NAME $i)
+ DESC=$(rpm_query SUMMARY $i)
echo "<li><a href='../$i'>$NAME</a> --
$DESC</li>" >> $OUT
done
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
