[freeside-commits] freeside/rpm/build/mock centos-5-i386.cfg, 1.1, 1.2 centos-5-x86_64.cfg, 1.1, 1.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/rpm/build/mock
In directory wavetail.420.am:/tmp/cvs-serv7424/mock

Modified Files:
	centos-5-i386.cfg centos-5-x86_64.cfg 
Log Message:
generating RPMS, RT#8190

Index: centos-5-i386.cfg
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rpm/build/mock/centos-5-i386.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- centos-5-i386.cfg	8 Jul 2010 09:32:14 -0000	1.1
+++ centos-5-i386.cfg	8 Jul 2010 21:28:58 -0000	1.2
@@ -19,15 +19,15 @@
 
 [os]
 name=os
-#mirrorlist=http://mirrorlist.centos.org/?release=5&arch=i386&repo=os
-#baseurl=http://mirror.centos.org/centos/5/os/i386/
-baseurl=file:///home/rsiddall/mock/repos/centos/5/os/i386/
+mirrorlist=http://mirrorlist.centos.org/?release=5&arch=i386&repo=os
+baseurl=http://mirror.centos.org/centos/5/os/i386/
+#baseurl=file:///home/rsiddall/mock/repos/centos/5/os/i386/
 
 [updates]
 name=updates
-#mirrorlist=http://mirrorlist.centos.org/?release=5&arch=i386&repo=updates
-#baseurl=http://mirror.centos.org/centos/5/updates/i386/
-baseurl=file:///home/rsiddall/mock/repos/centos/5/updates/i386/
+mirrorlist=http://mirrorlist.centos.org/?release=5&arch=i386&repo=updates
+baseurl=http://mirror.centos.org/centos/5/updates/i386/
+#baseurl=file:///home/rsiddall/mock/repos/centos/5/updates/i386/
 
 [groups]
 name=groups

Index: centos-5-x86_64.cfg
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rpm/build/mock/centos-5-x86_64.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- centos-5-x86_64.cfg	8 Jul 2010 09:32:14 -0000	1.1
+++ centos-5-x86_64.cfg	8 Jul 2010 21:28:58 -0000	1.2
@@ -4,8 +4,38 @@
 config_opts['root'] = 'centos-5-x86_64'
 config_opts['target_arch'] = 'x86_64'
 
+config_opts['cleanup_on_failure'] = 0
+
+config_opts['chroot_setup_cmd'] = 'install buildsys-build'
+
+# caching related options                                                       
+#these are probably obsolete?
+config_opts['rebuild_cache'] = False
+#config_opts['use_cache'] = False
+config_opts['use_cache'] = True
+config_opts['pack_cmd'] = "/usr/sbin/mock-helper pack"
+config_opts['unpack_cmd'] = "/usr/sbin/mock-helper unpack"
+config_opts['cache_ext'] = ".tar.gz"
+config_opts['cache_topdir'] = "/var/cache/mock"
+#config_opts['max_cache_age_days'] = 15
+config_opts['max_cache_age_days'] = 150
+
+# config_opts['plugin_conf']['ccache_enable'] = True
+config_opts['plugin_conf']['ccache_enable'] = False
+# config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '4G'
+# config_opts['plugin_conf']['ccache_opts']['dir'] = "%(cache_topdir)s/%(root)s/ccache/"
+config_opts['plugin_conf']['yum_cache_enable'] = True
+config_opts['plugin_conf']['yum_cache_opts']['max_age_days'] = 30
+config_opts['plugin_conf']['yum_cache_opts']['dir'] = "%(cache_topdir)s/%(root)s/yum_cache/"
+config_opts['plugin_conf']['root_cache_enable'] = True
+config_opts['plugin_conf']['root_cache_opts']['max_age_days'] = 15
+config_opts['plugin_conf']['root_cache_opts']['dir'] = "%(cache_topdir)s/%(root)s/root_cache/"
+config_opts['plugin_conf']['root_cache_opts']['compress_program'] = "gzip"
+config_opts['plugin_conf']['root_cache_opts']['extension'] = ".gz"
+
 
 config_opts['yum.conf'] = """
+
 [main]
 cachedir=/var/cache/yum
 debuglevel=1
@@ -20,38 +50,39 @@
 
 [os]
 name=os
-#mirrorlist=http://mirrorlist.centos.org/?release=5&arch=x86_64&repo=os
-#baseurl=http://mirror.centos.org/centos/5/os/x86_64/
-baseurl=file:///home/rsiddall/mock/repos/centos/5/os/x86_64/
+mirrorlist=http://mirrorlist.centos.org/?release=5&arch=x86_64&repo=os
+baseurl=http://mirror.centos.org/centos/5/os/x86_64/
+#baseurl=file:///home/rsiddall/mock/repos/centos/5/os/x86_64/
 
 [updates]
 name=updates
-#mirrorlist=http://mirrorlist.centos.org/?release=5&arch=x86_64&repo=updates
-#baseurl=http://mirror.centos.org/centos/5/updates/x86_64/
-baseurl=file:///home/rsiddall/mock/repos/centos/5/updates/x86_64/
+mirrorlist=http://mirrorlist.centos.org/?release=5&arch=x86_64&repo=updates
+baseurl=http://mirror.centos.org/centos/5/updates/x86_64/
+#baseurl=file:///home/rsiddall/mock/repos/centos/5/updates/x86_64/
 
 [groups]
 name=groups
 baseurl=http://dev.centos.org/centos/buildsys/5/
 """
 
-
-config_opts['macros'] = """
-%_topdir /builddir/build
-%_rpmfilename  %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
-
-# Change the next two lines to reflect yourself.
-
-%packager  Freeside Internet Services, Inc. <rpm at freeside.biz>
-#%vendor   
-#%distribution 
-
-# please change this to reflect the Distro Tree and Repo hosting packages!
-#%dist    <distro>.<yourtag> 
-%centos_ver     5
-
-#%_smp_mflags   -j1
-
-"""
+#something here is causing a problem, don't know what, see if we need anything
+#re-enabled
+#config_opts['macros'] = """
+#%_topdir /builddir/build
+#%_rpmfilename  %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
+#
+## Change the next two lines to reflect yourself.
+#
+#%packager  Freeside Internet Services, Inc. <rpm at freeside.biz>
+##%vendor   
+##%distribution 
+#
+## please change this to reflect the Distro Tree and Repo hosting packages!
+##%dist    <distro>.<yourtag> 
+#%centos_ver     5
+#
+##%_smp_mflags   -j1
+#
+#"""