Author: benm
Date: 2005-04-17 17:17:05 -0400 (Sun, 17 Apr 2005)
New Revision: 43176
Removed:
trunk/release/packaging/do-install-deps
Modified:
trunk/release/packaging/defs/gecko-sharp-2.0
trunk/release/packaging/defs/gtk-sharp
trunk/release/packaging/defs/gtk-sharp-2.0
trunk/release/packaging/defs/gtksourceview-sharp-2.0
trunk/release/packaging/defs/mod_mono
trunk/release/packaging/defs/monodoc
trunk/release/packaging/defs/xsp
trunk/release/packaging/install-deps
Log:
non-rug-based dep installation
Modified: trunk/release/packaging/defs/gecko-sharp-2.0
===================================================================
--- trunk/release/packaging/defs/gecko-sharp-2.0 2005-04-17 20:48:31 UTC
(rev 43175)
+++ trunk/release/packaging/defs/gecko-sharp-2.0 2005-04-17 21:17:05 UTC
(rev 43176)
@@ -14,9 +14,7 @@
}
MONO_DEPS=(
- gtk-sharp2
- gtk-sharp2-gapi
- mono-core
- mono-devel
+ mono-1.1
+ gtk-sharp-2.0
monodoc
)
\ No newline at end of file
Modified: trunk/release/packaging/defs/gtk-sharp
===================================================================
--- trunk/release/packaging/defs/gtk-sharp 2005-04-17 20:48:31 UTC (rev
43175)
+++ trunk/release/packaging/defs/gtk-sharp 2005-04-17 21:17:05 UTC (rev
43176)
@@ -12,8 +12,7 @@
USE_HOSTS=([EMAIL PROTECTED])
MONO_DEPS=(
- mono-core
- mono-devel
+ mono-1.1
)
get_destroot () {
Modified: trunk/release/packaging/defs/gtk-sharp-2.0
===================================================================
--- trunk/release/packaging/defs/gtk-sharp-2.0 2005-04-17 20:48:31 UTC (rev
43175)
+++ trunk/release/packaging/defs/gtk-sharp-2.0 2005-04-17 21:17:05 UTC (rev
43176)
@@ -7,8 +7,7 @@
USE_HOSTS=([EMAIL PROTECTED])
MONO_DEPS=(
- mono-core
- mono-devel
+ mono-1.1
)
get_destroot () {
Modified: trunk/release/packaging/defs/gtksourceview-sharp-2.0
===================================================================
--- trunk/release/packaging/defs/gtksourceview-sharp-2.0 2005-04-17
20:48:31 UTC (rev 43175)
+++ trunk/release/packaging/defs/gtksourceview-sharp-2.0 2005-04-17
21:17:05 UTC (rev 43176)
@@ -13,9 +13,7 @@
}
MONO_DEPS=(
- gtk-sharp2
- gtk-sharp2-gapi
- mono-core
- mono-devel
+ mono-1.1
+ gtk-sharp-2.0
monodoc
)
\ No newline at end of file
Modified: trunk/release/packaging/defs/mod_mono
===================================================================
--- trunk/release/packaging/defs/mod_mono 2005-04-17 20:48:31 UTC (rev
43175)
+++ trunk/release/packaging/defs/mod_mono 2005-04-17 21:17:05 UTC (rev
43176)
@@ -24,8 +24,6 @@
}
MONO_DEPS=(
+ mono-1.1
xsp
- mono-core
- mono-devel
- mono-web
)
\ No newline at end of file
Modified: trunk/release/packaging/defs/monodoc
===================================================================
--- trunk/release/packaging/defs/monodoc 2005-04-17 20:48:31 UTC (rev
43175)
+++ trunk/release/packaging/defs/monodoc 2005-04-17 21:17:05 UTC (rev
43176)
@@ -20,8 +20,6 @@
}
MONO_DEPS=(
+ mono-1.1
gtk-sharp
- mono-core
- mono-devel
- mono-web
)
\ No newline at end of file
Modified: trunk/release/packaging/defs/xsp
===================================================================
--- trunk/release/packaging/defs/xsp 2005-04-17 20:48:31 UTC (rev 43175)
+++ trunk/release/packaging/defs/xsp 2005-04-17 21:17:05 UTC (rev 43176)
@@ -20,7 +20,5 @@
}
MONO_DEPS=(
- mono-core
- mono-devel
- mono-web
+ mono-1.1
)
\ No newline at end of file
Deleted: trunk/release/packaging/do-install-deps
===================================================================
--- trunk/release/packaging/do-install-deps 2005-04-17 20:48:31 UTC (rev
43175)
+++ trunk/release/packaging/do-install-deps 2005-04-17 21:17:05 UTC (rev
43176)
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-PACKAGES="$*"
-
-if [ ! -f /usr/sbin/rcd ]; then
- echo "No red carpet!!"
- exit 1;
-fi
-
-/etc/init.d/rcd start
-rug ping
-
-while ! rug ping; do echo waiting; done
-
-rug solvedeps -yr $PACKAGES || exit 1
-
-/etc/init.d/rcd stop &> /dev/null
-
-exit 0
\ No newline at end of file
Modified: trunk/release/packaging/install-deps
===================================================================
--- trunk/release/packaging/install-deps 2005-04-17 20:48:31 UTC (rev
43175)
+++ trunk/release/packaging/install-deps 2005-04-17 21:17:05 UTC (rev
43176)
@@ -1,13 +1,44 @@
#!/bin/sh
+. shared-code.sh
+
TARGET=$1
+PACKAGE=$2
+. conf/$TARGET
+. defs/$PACKAGE
-shift
+distro_info $TARGET
-PACKAGES="$*"
[EMAIL PROTECTED]
-. conf/$TARGET
-scp do-install-deps $target_host:$jaildir/tmp
+RPMS=$i
-./jail-do $TARGET sh -x /tmp/do-install-deps "$PACKAGES"
\ No newline at end of file
+for i in $DEPS; do
+ . defs/$i
+
+ get_destroot
+
+ [ -d packages/$DEST_ROOT/$i/*/ ] || (
+ echo "Could not find $i for $DISTRO (looking in $DEST_ROOT)"
+ exit 1;
+ )
+
+ VERSION=`ls -d packages/$DEST_ROOT/$i/*/ -t -1 | head -n1`
+
+ for i in $VERSION/*.rpm; do
+ [[ $i == *.src.rpm ]] && continue
+
+ RPMS=([EMAIL PROTECTED] $i)
+ done
+done
+
+[ [EMAIL PROTECTED] -eq 0 ] && exit 0
+
+
+./jail-do $TARGET "sh -x -c 'rm -rf /tmp/install-packages; mkdir -p
/tmp/install-packages -m777'"
+
+scp [EMAIL PROTECTED] $target_host:$jaildir/tmp/install-packages
+
+./jail-do $TARGET "sh -x -c 'rpm -Uhv /tmp/install-packages/*.rpm'"
+./jail-do $TARGET "sh -x -c 'rm -rf /tmp/install-packages'"
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches