Author: benm
Date: 2005-04-12 19:26:00 -0400 (Tue, 12 Apr 2005)
New Revision: 42883
Added:
trunk/release/packaging/conf/nld-9-i586
trunk/release/packaging/conf/suse-93-i586
trunk/release/packaging/defs/gtk-sharp
trunk/release/packaging/defs/gtk-sharp-2.0
trunk/release/packaging/defs/libgdiplus-1.1
trunk/release/packaging/defs/mod_mono
trunk/release/packaging/defs/monodoc
trunk/release/packaging/defs/xsp
trunk/release/packaging/do-install-deps
trunk/release/packaging/install-deps
trunk/release/packaging/jail-do
Removed:
trunk/release/packaging/conf/sles-8-i386
trunk/release/packaging/defs/libgdiplus
Modified:
trunk/release/packaging/build
trunk/release/packaging/do-build
Log:
my life over the last few days
Modified: trunk/release/packaging/build
===================================================================
--- trunk/release/packaging/build 2005-04-12 23:15:15 UTC (rev 42882)
+++ trunk/release/packaging/build 2005-04-12 23:26:00 UTC (rev 42883)
@@ -14,6 +14,8 @@
distro=$1
package=$2
+LOGFILE=logs/$package-$distro
+
usage()
{
echo "Usage is: build configuration package"
@@ -29,18 +31,27 @@
exit 1
fi
-. conf/$1
+. conf/$distro
+. defs/$package
-scp do-build $target_host:$jaildir/tmp
-remote_cmd="$chroot $jaildir sh -x /tmp/do-build $package"
-(echo > status/$distro; ssh $target_host "sudo $remote_cmd" >&
logs/$package-$distro; rm status/$distro)
+
+if [ ! [EMAIL PROTECTED] -eq 0 ]; then
+ if ! ./install-deps $distro [EMAIL PROTECTED] &> $LOGFILE; then
+ echo Dependency installation, see log in $LOGFILE for details
+ exit 1
+ fi
+fi
+
+scp do-build ../conf/$package/ximian-build.conf $target_host:$jaildir/tmp
+
+(echo > status/$distro; ./jail-do $distro sh -x /tmp/do-build $package >>
$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 logs/$package-$distro for details
+ echo Build failed, see log in $LOGFILE for details
exit 1;
fi
-. defs/$package
get_destroot $distro
Added: trunk/release/packaging/conf/nld-9-i586
===================================================================
--- trunk/release/packaging/conf/nld-9-i586 2005-04-12 23:15:15 UTC (rev
42882)
+++ trunk/release/packaging/conf/nld-9-i586 2005-04-12 23:26:00 UTC (rev
42883)
@@ -0,0 +1,3 @@
[EMAIL PROTECTED]
+jaildir=/jails/nld-9-i586-root-0/jail
+chroot=/usr/sbin/chroot
Deleted: trunk/release/packaging/conf/sles-8-i386
===================================================================
--- trunk/release/packaging/conf/sles-8-i386 2005-04-12 23:15:15 UTC (rev
42882)
+++ trunk/release/packaging/conf/sles-8-i386 2005-04-12 23:26:00 UTC (rev
42883)
@@ -1,3 +0,0 @@
[EMAIL PROTECTED]
-jaildir=/jails/sles-8-i386-duncan-0
-chroot=/usr/sbin/chroot
Added: trunk/release/packaging/conf/suse-93-i586
===================================================================
--- trunk/release/packaging/conf/suse-93-i586 2005-04-12 23:15:15 UTC (rev
42882)
+++ trunk/release/packaging/conf/suse-93-i586 2005-04-12 23:26:00 UTC (rev
42883)
@@ -0,0 +1,3 @@
[EMAIL PROTECTED]
+jaildir=/jails/suse-93-i586-root-0/jail
+chroot=/usr/sbin/chroot
Added: trunk/release/packaging/defs/gtk-sharp
===================================================================
--- trunk/release/packaging/defs/gtk-sharp 2005-04-12 23:15:15 UTC (rev
42882)
+++ trunk/release/packaging/defs/gtk-sharp 2005-04-12 23:26:00 UTC (rev
42883)
@@ -0,0 +1,20 @@
+BUILD_HOSTS=(
+ fedora-3-i386
+ nld-9-i586
+ redhat-9-i386
+ rhel-3-i386
+ rhel-4-i386
+ sles-9-i586
+ sles-9-x86_64
+ suse-91-i586
+ suse-92-i586
+)
+
+MONO_DEPS=(
+ mono-core
+ mono-devel
+)
+
+get_destroot () {
+ DEST_ROOT=$1
+}
\ No newline at end of file
Added: trunk/release/packaging/defs/gtk-sharp-2.0
===================================================================
--- trunk/release/packaging/defs/gtk-sharp-2.0 2005-04-12 23:15:15 UTC (rev
42882)
+++ trunk/release/packaging/defs/gtk-sharp-2.0 2005-04-12 23:26:00 UTC (rev
42883)
@@ -0,0 +1,14 @@
+BUILD_HOSTS=(
+ fedora-3-i386
+ nld-9-i586
+ suse-93-i586
+)
+
+MONO_DEPS=(
+ mono-core
+ mono-devel
+)
+
+get_destroot () {
+ DEST_ROOT=$1
+}
\ No newline at end of file
Deleted: trunk/release/packaging/defs/libgdiplus
===================================================================
--- trunk/release/packaging/defs/libgdiplus 2005-04-12 23:15:15 UTC (rev
42882)
+++ trunk/release/packaging/defs/libgdiplus 2005-04-12 23:26:00 UTC (rev
42883)
@@ -1,16 +0,0 @@
-BUILD_HOSTS=(
- fedora-3-i386
- nld-9-x86_64
- redhat-9-i386
- rhel-3-i386
- rhel-4-i386
- sles-9-i586
- sles-9-x86_64
- suse-90-i586
- suse-91-i586
- suse-92-i586
-)
-
-get_destroot () {
- DEST_ROOT=$1
-}
\ No newline at end of file
Added: trunk/release/packaging/defs/libgdiplus-1.1
===================================================================
--- trunk/release/packaging/defs/libgdiplus-1.1 2005-04-12 23:15:15 UTC (rev
42882)
+++ trunk/release/packaging/defs/libgdiplus-1.1 2005-04-12 23:26:00 UTC (rev
42883)
@@ -0,0 +1,16 @@
+BUILD_HOSTS=(
+ fedora-3-i386
+ nld-9-x86_64
+ redhat-9-i386
+ rhel-3-i386
+ rhel-4-i386
+ sles-9-i586
+ sles-9-x86_64
+ suse-90-i586
+ suse-91-i586
+ suse-92-i586
+)
+
+get_destroot () {
+ DEST_ROOT=$1
+}
\ No newline at end of file
Added: trunk/release/packaging/defs/mod_mono
===================================================================
--- trunk/release/packaging/defs/mod_mono 2005-04-12 23:15:15 UTC (rev
42882)
+++ trunk/release/packaging/defs/mod_mono 2005-04-12 23:26:00 UTC (rev
42883)
@@ -0,0 +1,27 @@
+BUILD_HOSTS=(
+ sles-9-i586
+ redhat-9-i386
+
+ sles-9-x86_64
+ # need redhat x86 distro
+)
+
+get_destroot () {
+ case "$1" in
+ *-i[35]86) ARCH=x86 ;;
+ *-x86_64) ARCH=x86_64 ;;
+ esac
+ case "$1" in
+ fedora-* | redhat-* ) DISTRO_TYPE=redhat;;
+ suse-* | nld-* | sles-* ) DISTRO_TYPE=suse;;
+ esac
+
+ DEST_ROOT=$DISTRO_TYPE-$ARCH
+}
+
+MONO_DEPS=(
+ xsp
+ mono-core
+ mono-devel
+ mono-web
+)
\ No newline at end of file
Added: trunk/release/packaging/defs/monodoc
===================================================================
--- trunk/release/packaging/defs/monodoc 2005-04-12 23:15:15 UTC (rev
42882)
+++ trunk/release/packaging/defs/monodoc 2005-04-12 23:26:00 UTC (rev
42883)
@@ -0,0 +1,14 @@
+BUILD_HOSTS=(
+ nld-9-i586
+)
+
+get_destroot () {
+ DEST_ROOT=noarch
+}
+
+MONO_DEPS=(
+ gtk-sharp
+ mono-core
+ mono-devel
+ mono-web
+)
\ No newline at end of file
Added: trunk/release/packaging/defs/xsp
===================================================================
--- trunk/release/packaging/defs/xsp 2005-04-12 23:15:15 UTC (rev 42882)
+++ trunk/release/packaging/defs/xsp 2005-04-12 23:26:00 UTC (rev 42883)
@@ -0,0 +1,13 @@
+BUILD_HOSTS=(
+ nld-9-i586
+)
+
+get_destroot () {
+ DEST_ROOT=noarch
+}
+
+MONO_DEPS=(
+ mono-core
+ mono-devel
+ mono-web
+)
\ No newline at end of file
Modified: trunk/release/packaging/do-build
===================================================================
--- trunk/release/packaging/do-build 2005-04-12 23:15:15 UTC (rev 42882)
+++ trunk/release/packaging/do-build 2005-04-12 23:26:00 UTC (rev 42883)
@@ -13,8 +13,9 @@
rm -rf /tmp/root/built-packages || exit 1
cd /tmp && rm -rf scratch && mkdir scratch && cd scratch || exit 1
-cvs co mono-conf || exit 1
-cd mono-conf/$1 || exit 1
+
+mv ../ximian-build.conf .
+
bb_redo || exit 1
rpm -rf /tmp/root/built-packages/*.src.rpm
Added: trunk/release/packaging/do-install-deps
===================================================================
--- trunk/release/packaging/do-install-deps 2005-04-12 23:15:15 UTC (rev
42882)
+++ trunk/release/packaging/do-install-deps 2005-04-12 23:26:00 UTC (rev
42883)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+PACKAGES="$*"
+
+if [ ! -f /usr/sbin/rcd ]; then
+ echo "No red carpet!!"
+ exit 1;
+fi
+
+/usr/sbin/rcd -r
+
+rug ping
+
+while ! rug ping; do echo waiting; done
+
+rug solvedeps -yr $PACKAGES
+
+/etc/init.d/rcd stop &> /dev/null
\ No newline at end of file
Added: trunk/release/packaging/install-deps
===================================================================
--- trunk/release/packaging/install-deps 2005-04-12 23:15:15 UTC (rev
42882)
+++ trunk/release/packaging/install-deps 2005-04-12 23:26:00 UTC (rev
42883)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+TARGET=$1
+
+shift
+
+PACKAGES="$*"
+
+. conf/$TARGET
+
+scp do-install-deps $target_host:$jaildir/tmp
+
+./jail-do $TARGET sh -x /tmp/do-install-deps "$PACKAGES"
\ No newline at end of file
Property changes on: trunk/release/packaging/install-deps
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/release/packaging/jail-do
===================================================================
--- trunk/release/packaging/jail-do 2005-04-12 23:15:15 UTC (rev 42882)
+++ trunk/release/packaging/jail-do 2005-04-12 23:26:00 UTC (rev 42883)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+TARGET=$1
+
+shift
+
+. conf/$TARGET
+
+ssh -t $target_host "sudo $chroot $jaildir $*"
\ No newline at end of file
Property changes on: trunk/release/packaging/jail-do
___________________________________________________________________
Name: svn:executable
+ *
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
