Author: wade
Date: 2007-07-18 18:33:59 -0400 (Wed, 18 Jul 2007)
New Revision: 82248

Modified:
   trunk/release/jailbuilder/buildjail.py
   trunk/release/jailbuilder/gatherrpms.py
   trunk/release/jailbuilder/jail_config.py
Log:
buildjail.py:
-allow a directory structure where the rpms resides,
 instead of depending on one directory with only
 rpms. Makes it possible to mount isos in the rpm dir
 and skipping the ./gatherrpms.py step when dealing
 with isos.

jail_config.py:
-store regexes uses by both gatherrpms.py and buildjail.py 
-Update package lists for distros



Modified: trunk/release/jailbuilder/buildjail.py
===================================================================
--- trunk/release/jailbuilder/buildjail.py      2007-07-18 22:02:25 UTC (rev 
82247)
+++ trunk/release/jailbuilder/buildjail.py      2007-07-18 22:33:59 UTC (rev 
82248)
@@ -38,15 +38,13 @@
 sys.path+=['../pyutils']
 
 import utils
+import jail_config
 
 
-
 class Package:
 
        # "Static" Members/Methods
        # Being here they only get compiled once
-       ignoresource = re.compile("\.(no)?src\.rpm$")
-       matchrpm = re.compile("\.rpm$")
        marker = re.compile("^____")
        rpmlib_req = re.compile("^rpmlib(.*)")
 
@@ -119,7 +117,7 @@
 
        def valid_rpm_name(self):
 
-               if Package.matchrpm.search(self.full_path):
+               if jail_config.matchrpm.search(self.full_path):
                        return 1
                else:
                        return 0
@@ -189,7 +187,7 @@
                self.requires = {}
                self.provides = {}
 
-               self.load_package_cache()
+               self.load_package_cache(self.config.rpm_source_dir)
 
                #print self.provide_map
 
@@ -208,37 +206,42 @@
                self.post_config()
 
 
-       def load_package_cache(self):
+       def load_package_cache(self, package_dir):
+       
+               for rpm_filename in os.listdir(package_dir):
 
-               files = os.listdir(self.config.rpm_source_dir)
-               files.sort()
+                       f = package_dir + os.sep + rpm_filename
 
-               for rpm_filename in files:
+                       # Recursively descend through dir structure
+                               # This will allow skipping copying rpm files 
from isos
+                       if os.path.isdir(f):
+                               self.load_package_cache(f)
+                       # Ignore non rpm files, as well as .src.rpm files
+                       elif jail_config.ignoresource.search(f) or not 
jail_config.matchrpm.search(f):
+                               continue
+                       else:
+                               my_package = self.cache.retrieve(f)
 
-                       my_package = self.cache.retrieve(
-                               os.path.join(self.config.rpm_source_dir, 
rpm_filename))
-                               
+                               # If the package is a valid arch, and
+                               # It hasn't been loaded yet, or if this arch 
has a priority over the loaded package
+                               if 
self.config.valid_arch.count(my_package.arch) and ( not 
self.available_rpms.has_key(my_package.name) or 
self.config.valid_arch.index(self.available_rpms[my_package.name].arch) > 
self.config.valid_arch.index(my_package.arch)):
+                                       # If the package is going to be 
overwritten, clean the old one up
+                                       if 
self.available_rpms.has_key(my_package.name):
+                                               del 
self.available_rpms[my_package.name]
 
-                       # If the package is a valid arch, and
-                       # It hasn't been loaded yet, or if this arch has a 
priority over the loaded package
-                       if self.config.valid_arch.count(my_package.arch) and ( 
not self.available_rpms.has_key(my_package.name) or 
self.config.valid_arch.index(self.available_rpms[my_package.name].arch) > 
self.config.valid_arch.index(my_package.arch)):
-                               # If the package is going to be overwritten, 
clean the old one up
-                               if self.available_rpms.has_key(my_package.name):
-                                       del self.available_rpms[my_package.name]
+                                       self.available_rpms[my_package.name] = 
my_package
 
-                               self.available_rpms[my_package.name] = 
my_package
+                                       # Load up dictionary lookup to quickly 
resolve deps
+                                       for provide in my_package.provides:
+                                               self.provide_map[provide] = 
my_package.name
 
-                               # Load up dictionary lookup to quickly resolve 
deps
-                               for provide in my_package.provides:
-                                       self.provide_map[provide] = 
my_package.name
+                               else:
+                                       print "Skipping %s package for arch %s" 
% (my_package.name, my_package.arch)
+                                       # Don't need this object anymore
+                                       del my_package
 
-                       else:
-                               print "Skipping %s package for arch %s" % 
(my_package.name, my_package.arch)
-                               # Don't need this object anymore
-                               del my_package
 
 
-
        def collect_required_packages(self):
                # Have two data structures: current requires, and current 
supplied provides (these structures deal with rpms names, not filenames)
                #  Start adding new packages to get rid of the requires list

Modified: trunk/release/jailbuilder/gatherrpms.py
===================================================================
--- trunk/release/jailbuilder/gatherrpms.py     2007-07-18 22:02:25 UTC (rev 
82247)
+++ trunk/release/jailbuilder/gatherrpms.py     2007-07-18 22:33:59 UTC (rev 
82248)
@@ -23,6 +23,8 @@
 import time
 import distutils.dir_util
 
+import jail_config
+
 # For debugging
 import pdb
 
@@ -30,10 +32,6 @@
 # Miscellaneous functions and vars
 ############################################################
 
-# They only get compiled once here...
-ignoresource = re.compile("\.(no)?src\.rpm$")
-matchrpm = re.compile("\.rpm$")
-
 def print_debug(string):
        global debug
        debug = 0
@@ -60,6 +58,11 @@
                return 0
 
 
+iso_notice = """*** Note ***"
+ This method is obsolete because you can simply
+ mount the isos under rpms/<distro_name>, 
+ and use buildjail.py directly"""
+
 ############################################################
 #  Get from iso images
 ############################################################
@@ -100,6 +103,7 @@
                os.chdir(cwd)
                print commands.getoutput("umount " + tempdir)
 
+       print iso_notice
 
        # Clean up
        os.rmdir(tempdir)
@@ -326,6 +330,7 @@
                distutils.dir_util.mkpath(destdir)
 
        if method == "iso":
+               print iso_notice
                fetch = get_from_cd
                # Get everything from index 2 on
                source = sys.argv[3:]

Modified: trunk/release/jailbuilder/jail_config.py
===================================================================
--- trunk/release/jailbuilder/jail_config.py    2007-07-18 22:02:25 UTC (rev 
82247)
+++ trunk/release/jailbuilder/jail_config.py    2007-07-18 22:33:59 UTC (rev 
82248)
@@ -1,4 +1,8 @@
+import re
 
+ignoresource = re.compile("\.(no)?src\.rpm$")
+matchrpm = re.compile("\.rpm$")
+
 valid_arch = {
        'ia64':         'ia64 noarch',
        'i386':         'i686 i586 i386 noarch',
@@ -13,15 +17,15 @@
        'sles-8': 'aaa_base autoconf automake gcc iputils make rug sles-release 
util-linux vim',
 
        #ftp://ftp.novell.com/pub/ximian/redcarpet2/sles-9-ia64/
-       'sles-9': 'XFree86-devel XFree86-libs aaa_base aaa_skel apache2 
apache2-devel apache2-prefork autoconf automake bison expat file fontconfig 
fontconfig-devel freetype2 freetype2-devel gcc gdb glib2 glib2-devel 
glibc-devel iputils libapr0 libjpeg libpng libpng-devel libtiff libtool 
libungif m4 make mktemp ncurses-devel patch perl-XML-Parser pkgconfig procps 
pwdutils rug sles-release sudo tar termcap unzip util-linux vim yast2 
yast2-ncurses yast2-packager yast2-ncurses zlib-devel',
+       'sles-9': 'XFree86-devel XFree86-libs aaa_base aaa_skel apache2 
apache2-devel apache2-prefork autoconf automake bison expat file fontconfig 
fontconfig-devel freetype2 freetype2-devel gcc gdb glib2 glib2-devel 
glibc-devel iputils libapr0 libjpeg libpng libpng-devel libtiff libtool 
libungif m4 make mktemp ncurses-devel patch perl-XML-Parser pkgconfig procps 
pwdutils rug sles-release sudo tar termcap unzip util-linux vim yast2 
yast2-ncurses yast2-packager yast2-ncurses zlib-devel librsvg-devel vte 
vte-devel pango-devel gtk2-devel libxml2-devel libart_lgpl-devel 
libgnomecanvas-devel libgnomeui libgnomeui-devel libglade2-devel libxslt-devel 
libgsf-devel libgnomeprint-devel libgnomeprintui-devel popt-devel esound-devel 
libbonoboui libgnome gnome-vfs2 libgnomeprint libgnomeprintui kbd netcfg',
 
        'suse-93': 'aaa_base autoconf automake gcc iputils make pwdutils rug 
util-linux vim',
 
        'suse-100': 'aaa_base apache2-devel apache2-prefork autoconf automake 
cpio esound-devel file freetype2-devel gcc gconf2-devel gettext giflib-devel 
glib2-devel gnome-panel-devel gtkhtml2-devel intltool iputils kbd libgda-devel 
libglade2-devel libgnomecanvas-devel libgnomedb-devel libgnomeprint 
libgnomeprint-devel libgnomeprintui libgnomeprintui-devel libgnomeui-devel 
libjpeg-devel libpng-devel librsvg librsvg-devel libtiff-devel libtool make man 
mozilla patch perl-XML-LibXML perl-XML-LibXML-Common perl-XML-NamespaceSupport 
perl-XML-Parser perl-XML-SAX pkgconfig popt-devel procps pwdutils python 
python-elementtree python-xml rpm-python sqlite2 sudo sysvinit tar unzip 
update-desktop-files util-linux vim vte vte-devel wget xorg-x11-devel yast2 
yast2-ncurses yast2-packager zlib-devel',
 
-       'suse-101': 'aaa_base apache2-devel apache2-prefork autoconf automake 
esound-devel file freetype2-devel gcc giflib-devel glib2-devel glibc-locale 
gnome-keyring-devel gnome-panel-devel gstreamer010-devel 
gstreamer010-plugins-base-devel gtk2-devel gtkhtml2-devel iputils 
libart_lgpl-devel libglade2-devel libgnomecanvas-devel libgnomeprint 
libgnomeprint-devel libgnomeprintui libgnomeprintui-devel libgnomeui-devel 
libgsf-devel libjpeg-devel libpng-devel librsvg librsvg-devel libtiff-devel 
libtool libxslt-devel make makedev patch perl-XML-LibXML perl-XML-LibXML-Common 
perl-XML-NamespaceSupport perl-XML-Parser perl-XML-SAX pkgconfig popt-devel 
procps pwdutils smart sqlite2 sudo sysvinit tar unzip util-linux vim vte-devel 
wget xorg-x11-devel yast2 zip zlib-devel',
+       'suse-101': 'aaa_base apache2-devel apache2-prefork autoconf automake 
esound-devel file freetype2-devel gcc giflib-devel glib2-devel glibc-locale 
gnome-keyring-devel gnome-panel-devel gstreamer010-devel 
gstreamer010-plugins-base-devel gtk2-devel gtkhtml2-devel iputils 
libart_lgpl-devel libglade2-devel libgnomecanvas-devel libgnomeprint 
libgnomeprint-devel libgnomeprintui libgnomeprintui-devel libgnomeui-devel 
libgsf-devel libjpeg-devel libpng-devel librsvg librsvg-devel libtiff-devel 
libtool libxslt-devel make makedev patch perl-XML-LibXML perl-XML-LibXML-Common 
perl-XML-NamespaceSupport perl-XML-Parser perl-XML-SAX pkgconfig popt-devel 
procps pwdutils smart sqlite2 sudo sysvinit tar unzip util-linux vim vte-devel 
wget xorg-x11-devel yast2 yast2-ncurses zip zlib-devel',
 
-       'suse-102': 'aaa_base apache2-devel apache2-prefork autoconf automake 
bc bison esound-devel file freetype2-devel gcc giflib-devel glib2-devel 
glibc-locale gnome-keyring-devel gnome-panel-devel gstreamer010-devel 
gstreamer010-plugins-base-devel gtk2-devel gtkhtml2-devel gtksourceview-devel 
intltool iputils libart_lgpl-devel libglade2-devel libgnomecanvas-devel 
libgnomeprint libgnomeprint-devel libgnomeprintui libgnomeprintui-devel 
libgnomeui-devel libgsf-devel libjpeg-devel libpng-devel librsvg librsvg-devel 
libtiff-devel libtool libxslt-devel make makedev patch perl-XML-LibXML 
perl-XML-LibXML-Common perl-XML-NamespaceSupport perl-XML-Parser perl-XML-SAX 
pkgconfig popt-devel procps pwdutils rsync sqlite2 subversion openssh sudo 
sysvinit tar update-desktop-files unzip util-linux vim vte-devel wget 
xorg-x11-devel yast2 zip zlib-devel zypper',
+       'suse-102': 'aaa_base apache2-devel apache2-prefork autoconf automake 
bc bison esound-devel file freetype2-devel gcc giflib-devel glib2-devel 
glibc-locale gnome-keyring-devel gnome-panel-devel gstreamer010-devel 
gstreamer010-plugins-base-devel gtk2-devel gtkhtml2-devel gtksourceview-devel 
intltool iputils libart_lgpl-devel libglade2-devel libgnomecanvas-devel 
libgnomeprint libgnomeprint-devel libgnomeprintui libgnomeprintui-devel 
libgnomeui-devel libgsf-devel libjpeg-devel libpng-devel librsvg librsvg-devel 
libtiff-devel libtool libxslt-devel make makedev patch perl-XML-LibXML 
perl-XML-LibXML-Common perl-XML-NamespaceSupport perl-XML-Parser perl-XML-SAX 
pkgconfig popt-devel procps pwdutils rsync sqlite2 subversion openssh sudo 
sysvinit tar update-desktop-files unzip util-linux vim vte-devel wget 
xorg-x11-devel yast2 yast2-ncurses zip zlib-devel zypper libgnomedb-devel',
 
        # ftp://ftp.novell.com/pub/ximian/redcarpet2/redhat-9-i386/
        # ftp://ftp.redhat.com/pub/redhat/linux/9/en/os/i386/
@@ -52,18 +56,16 @@
 post_install_notes = {
 
        'suse-101':     """# Create some devices:
-mknod /dev/null c 1 3
-mknod /dev/random  c  1 8
-mknod /dev/urandom c  1 9
-chmod 666 /dev/null /dev/random
-chmod 644 /dev/urandom
+mknod -m 666 /dev/null c 1 3
+mknod -m 666 /dev/zero c 1 5 
+mknod -m 666 /dev/random  c  1 8
+mknod -m 644 /dev/urandom c  1 9
 """,
        'suse-102':     """# Create some devices:
-mknod /dev/null c 1 3
-mknod /dev/random  c  1 8
-mknod /dev/urandom c  1 9
-chmod 666 /dev/null /dev/random
-chmod 644 /dev/urandom
+mknod -m 666 /dev/null c 1 3
+mknod -m 666 /dev/zero c 1 5 
+mknod -m 666 /dev/random  c  1 8
+mknod -m 644 /dev/urandom c  1 9
 
        Also, had to comment out my_test_for_space in SuSEconfig script
 """,

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to