Author: wade
Date: 2007-07-27 19:11:05 -0400 (Fri, 27 Jul 2007)
New Revision: 82899
Modified:
trunk/release/jailbuilder/buildjail.py
trunk/release/jailbuilder/jail_config.py
trunk/release/packaging/conf/fedora-5-i386
trunk/release/packaging/conf/suse-101-i586
trunk/release/packaging/conf/suse-102-i586
trunk/release/pyutils/buildenv.py
trunk/release/pyutils/packaging.py
Log:
conf/*:
-new jails to replace those lost on monobuild1
pyutils/*:
-add support to have 32 bit jails on 64 bit hosts, for machines that
support it
jailbuilder/*:
-update package list for fedora 5
-show all missing packages instead of failing on first missing package
Modified: trunk/release/jailbuilder/buildjail.py
===================================================================
--- trunk/release/jailbuilder/buildjail.py 2007-07-27 23:05:45 UTC (rev
82898)
+++ trunk/release/jailbuilder/buildjail.py 2007-07-27 23:11:05 UTC (rev
82899)
@@ -249,9 +249,15 @@
print "Required packages:"
# Add initial deps
+ missing_packs = []
for req_rpm in self.orig_required_rpms:
- self.add_package(req_rpm)
+ if not self.add_package(req_rpm):
+ missing_packs.append(req_rpm)
+ if missing_packs:
+ print "ERROR!: missing requested packages: %s" % ("
".join(missing_packs))
+ sys.exit(1)
+
#print "Current requires:"
#for i in self.requires:
# print i
@@ -303,8 +309,10 @@
else:
print "ERROR!: requesting package %s but do not
have %s in available rpms!" % (package_name, package_name)
- sys.exit(1)
+ return False
+ return True
+
def initialize_jail(self):
# Blow away the directory
Modified: trunk/release/jailbuilder/jail_config.py
===================================================================
--- trunk/release/jailbuilder/jail_config.py 2007-07-27 23:05:45 UTC (rev
82898)
+++ trunk/release/jailbuilder/jail_config.py 2007-07-27 23:11:05 UTC (rev
82899)
@@ -38,7 +38,7 @@
'fedora-4': 'autoconf automake bzip2 coreutils fontconfig-devel
freetype-devel gcc gcc-c++ libungif-devel glib2-devel gnome-panel-devel
gtk2-devel gtkhtml3-devel httpd-devel libart_lgpl-devel libglade2-devel
libgnomecanvas-devel libgnomeprintui22-devel libgnomeui-devel libjpeg-devel
libpng-devel librsvg2-devel libtiff-devel libtool libxml2-devel make
openssh-clients pango-devel perl-XML-Parser perl-XML-Simple pkgconfig rpm-build
sqlite-devel sudo tcl vim-enhanced vte-devel which yum zlib-devel',
- 'fedora-5': 'autoconf automake bzip2 coreutils fontconfig-devel
freetype-devel gcc gcc-c++ giflib-devel glib2-devel gnome-panel-devel
gtk2-devel gtkhtml3-devel httpd-devel libX11-devel libXrender-devel
libart_lgpl-devel libglade2-devel libgnomecanvas-devel libgnomeprintui22-devel
libgnomeui-devel libjpeg-devel libpng-devel librsvg2-devel libtiff-devel
libtool libxml2-devel make openssh-clients pango-devel perl-XML-Parser
perl-XML-Simple pkgconfig rpm-build sqlite-devel sudo tcl vim-enhanced
vte-devel which yum zlib-devel',
+ 'fedora-5': 'autoconf automake bzip2 coreutils fontconfig-devel
freetype-devel gcc gcc-c++ giflib-devel glib2-devel gnome-panel-devel
gtk2-devel gtkhtml3-devel httpd-devel libX11-devel libXrender-devel
libart_lgpl-devel libglade2-devel libgnomecanvas-devel libgnomeprintui22-devel
libgnomeui-devel libjpeg-devel libpng-devel librsvg2-devel libtiff-devel
libtool libxml2-devel make openssh-clients pango-devel perl-XML-Parser
perl-XML-Simple pkgconfig rpm-build sqlite-devel sudo tcl vim-enhanced
vte-devel which yum zlib-devel libXt-devel',
}
Modified: trunk/release/packaging/conf/fedora-5-i386
===================================================================
--- trunk/release/packaging/conf/fedora-5-i386 2007-07-27 23:05:45 UTC (rev
82898)
+++ trunk/release/packaging/conf/fedora-5-i386 2007-07-27 23:11:05 UTC (rev
82899)
@@ -1,5 +1,8 @@
username=builder
-hostname=monobuild1.boston.ximian.com
-root_dir=/jails/fedora-5-i386-root-0
+hostname=monobuild2.boston.ximian.com
+root_dir=/jails/fedora-5-i386
+chroot_path=/usr/bin/chroot
+arch_change_path=/usr/bin/linux32
+
USE_YUM=1
Modified: trunk/release/packaging/conf/suse-101-i586
===================================================================
--- trunk/release/packaging/conf/suse-101-i586 2007-07-27 23:05:45 UTC (rev
82898)
+++ trunk/release/packaging/conf/suse-101-i586 2007-07-27 23:11:05 UTC (rev
82899)
@@ -1,8 +1,11 @@
username=builder
-hostname=monobuild1.boston.ximian.com
-root_dir=/jails/suse-101-i586/jail
+hostname=monobuild2.boston.ximian.com
+root_dir=/jails/suse-101-i586
target_command_prefix=". /etc/profile;"
+chroot_path=/usr/bin/chroot
+arch_change_path=/usr/bin/linux32
+
distro_aliases=(
sles-10-i586
sled-10-i586
Modified: trunk/release/packaging/conf/suse-102-i586
===================================================================
--- trunk/release/packaging/conf/suse-102-i586 2007-07-27 23:05:45 UTC (rev
82898)
+++ trunk/release/packaging/conf/suse-102-i586 2007-07-27 23:11:05 UTC (rev
82899)
@@ -1,8 +1,11 @@
username=builder
-hostname=monobuild1.boston.ximian.com
+hostname=monobuild2.boston.ximian.com
root_dir=/jails/suse-102-i586
target_command_prefix=". /etc/profile;"
+chroot_path=/usr/bin/chroot
+arch_change_path=/usr/bin/linux32
+
# had to create libexpat.so.0 -> libexpat.so.1.5.0
# so that xgettext would work for make dist for mono-tools,
# filed bug: https://bugzilla.novell.com/show_bug.cgi?id=264110
Modified: trunk/release/pyutils/buildenv.py
===================================================================
--- trunk/release/pyutils/buildenv.py 2007-07-27 23:05:45 UTC (rev 82898)
+++ trunk/release/pyutils/buildenv.py 2007-07-27 23:11:05 UTC (rev 82899)
@@ -23,7 +23,7 @@
class buildenv:
- def __init__(self, username="", hostname="", root_dir="",
lock_filename="", target_command_prefix="", env=config.env_vars, my_logger="",
login_mode='ssh', copy_mode='scp', exec_mode='ssh'):
+ def __init__(self, username="", hostname="", root_dir="",
lock_filename="", target_command_prefix="", arch_change_path="",
env=config.env_vars, my_logger="", login_mode='ssh', copy_mode='scp',
exec_mode='ssh'):
self.login_mode=login_mode
self.copy_mode=copy_mode
@@ -72,6 +72,10 @@
self.target_command_prefix = target_command_prefix
+ # Optional command to run to prepend executing the shell. suse
x86_64 has 'linux32', and sles s390x has 's390'
+ # allows 32bit jails on 64bit hosts
+ self.arch_change_path = arch_change_path
+
# Add some things into the 'env' map
self.env['local_tar_path'] = config.tar_path
@@ -105,7 +109,7 @@
mode = self.login_mode
# TODO: the old code didn't call a shell when root_dir wasn't
set (does that matter?)
- command = "%s %s %s" % (self.root_dir_options,
self.env['shell_path'], "-l")
+ command = "%s %s %s %s" % (self.arch_change_path,
self.root_dir_options, self.env['shell_path'], "-l")
mode = self.modes[mode].login(command)
@@ -165,7 +169,7 @@
self.exec_util_files_copied = True
# Double quotes are very meticulous
- command = '%s %s %s "%s %s %s"' % (self.root_dir_options,
self.env['shell_path'], "-c", self.target_command_prefix, sudo_opts, command)
+ command = '%s %s %s %s "%s %s %s"' % (self.arch_change_path,
self.root_dir_options, self.env['shell_path'], "-c",
self.target_command_prefix, sudo_opts, command)
return self.modes[mode].execute_command(command,
my_logger=my_logger)
@@ -476,6 +480,7 @@
error = 0
try:
distutils.dir_util.mkpath(dir)
+ os.chmod(dir, 0777)
except:
error = 1
return error
Modified: trunk/release/pyutils/packaging.py
===================================================================
--- trunk/release/pyutils/packaging.py 2007-07-27 23:05:45 UTC (rev 82898)
+++ trunk/release/pyutils/packaging.py 2007-07-27 23:11:05 UTC (rev 82899)
@@ -62,7 +62,7 @@
self.load_computed_info()
self.load_configured_info()
- for i in "username hostname root_dir
target_command_prefix".split():
+ for i in "username hostname root_dir
target_command_prefix arch_change_path".split():
if self.info.has_key(i):
buildenv_args[i] = self.info[i]
# Remove the stale arg from buildenv_args
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches