Author: wade
Date: 2007-06-12 23:29:01 -0400 (Tue, 12 Jun 2007)
New Revision: 79374
Modified:
trunk/release/conf/mono/ximian-build.conf
trunk/release/linux-installer/buildlinux-installer
trunk/release/packaging/conf/suse-102-x86_64-1
trunk/release/packaging/defs/monodevelop
Log:
packaging/defs/monodevelop:
-Only support newer distros (md depends on gtk# 2.8 now)
linux-installer/buildlinux-installer:
-use buildconf instead of buildenv
conf/mono/ximian-build.conf:
-remove duplicates in filelist
packaging/conf/suse-102-x86_64-1:
-add chroot to make this jail
Modified: trunk/release/conf/mono/ximian-build.conf
===================================================================
--- trunk/release/conf/mono/ximian-build.conf 2007-06-13 03:06:22 UTC (rev
79373)
+++ trunk/release/conf/mono/ximian-build.conf 2007-06-13 03:29:01 UTC (rev
79374)
@@ -93,8 +93,6 @@
<i>[[usrprefix]]/lib/mono/1.0/chktrust.exe*</i>
<i>[[usrprefix]]/lib/mono/1.0/gacutil.exe*</i>
<i>[[usrprefix]]/lib/mono/2.0/gmcs.exe*</i>
- <i>[[usrprefix]]/lib/mono/2.0/gmcs.exe.config</i>
- <i>[[usrprefix]]/lib/mono/1.0/mcs.exe.config</i>
<i>[[usrprefix]]/lib/mono/1.0/mcs.exe*</i>
<i>[[usrprefix]]/lib/mono/1.0/mozroots.exe*</i>
<i>[[usrprefix]]/lib/mono/1.0/setreg.exe*</i>
Modified: trunk/release/linux-installer/buildlinux-installer
===================================================================
--- trunk/release/linux-installer/buildlinux-installer 2007-06-13 03:06:22 UTC
(rev 79373)
+++ trunk/release/linux-installer/buildlinux-installer 2007-06-13 03:29:01 UTC
(rev 79374)
@@ -26,6 +26,8 @@
# Probably won't ship gtk# until we provide fallback libraries like vmware
does.
+# md doesn't run on suse 93, needs 10.0 now, update accordingly (at least,
when the next version of md ships)
+
external_rpms_list = [
"ftp://archive.download.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/pkgconfig-0.14.0-3.i386.rpm";,
@@ -47,6 +49,11 @@
]
# rpm locations we build locally
+
+# Hrm... won't be able to use redhat-9 as a base, as it was heavily patched.
+# going to have to do some testing on this...
+# redhat's gtkhtml sharp package doesn't actually work on redhat boxes (not
like anyone is using those...)
+# but, we'll need it for the installer, and built on the lcd...
local_rpms = [
{'name': 'redhat-9-i386', 'packages': [
"mono",
@@ -171,10 +178,10 @@
# Collect local rpm files
for selection in local_rpms:
- env = packaging.buildenv(selection['name'])
+ conf = packaging.buildconf(selection['name'])
for pack in selection['packages']:
- pack_obj = packaging.package(env, pack)
+ pack_obj = packaging.package(conf, pack)
files += pack_obj.get_files()
# Extract all the rpms
Modified: trunk/release/packaging/conf/suse-102-x86_64-1
===================================================================
--- trunk/release/packaging/conf/suse-102-x86_64-1 2007-06-13 03:06:22 UTC
(rev 79373)
+++ trunk/release/packaging/conf/suse-102-x86_64-1 2007-06-13 03:29:01 UTC
(rev 79374)
@@ -1,6 +1,7 @@
username=builder
hostname=monobuild2.boston.ximian.com
root_dir=/jails/suse-102-x86_64
+chroot_path=/usr/bin/chroot
# suse 10.2 doesn't include /usr/lib/pkgconfig on x86_64, force it.
target_command_prefix=". /etc/profile; "
Modified: trunk/release/packaging/defs/monodevelop
===================================================================
--- trunk/release/packaging/defs/monodevelop 2007-06-13 03:06:22 UTC (rev
79373)
+++ trunk/release/packaging/defs/monodevelop 2007-06-13 03:29:01 UTC (rev
79374)
@@ -7,16 +7,16 @@
)
USE_HOSTS=(
- # These need to be removed after next md release (which depends on gtk#
2.8)
- fedora-3-i386
- fedora-4-i386
- fedora-4-ppc
- fedora-4-x86_64
- nld-9-i586
- rhel-4-i386
- suse-92-i586
- suse-93-i586
- suse-93-x86_64
+ # md 0.13.1 runs on these distros
+ #fedora-3-i386
+ #fedora-4-i386
+ #fedora-4-ppc
+ #fedora-4-x86_64
+ #nld-9-i586
+ #rhel-4-i386
+ #suse-92-i586
+ #suse-93-i586
+ #suse-93-x86_64
fedora-5-i386
fedora-5-x86_64
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
