generating RPMS, RT#8190

5 files changed, 78 insertions, 36 deletions

diff --git a/rpm/build/build-freeside b/rpm/build/build-freeside
index f4c6ca78f..d3bb21168 100755
--- a/rpm/build/build-freeside
+++ b/rpm/build/build-freeside
@@ -20,16 +20,16 @@ ARCHS='i386 x86_64'
 
 BUILDSYSDIR=`dirname $0`
 
-#MOCKARGS='--autocache'
-MOCKARGS="--configdir=$BUILDSYSDIR/mock"
+MOCKWORK="$BUILDSYSDIR/mockwork"
 
+#MOCKARGS='--autocache'
+MOCKARGS="--configdir=$BUILDSYSDIR/mock  --resultdir=$MOCKWORK"
 
 if [ -f $BUILDSYSDIR/buildsysrc ]; then
         #chmod a+x $BUILDSYSDIR/buildsysrc
 	#echo $BUILDSYSDIR/buildsysrc
 	. $BUILDSYSDIR/buildsysrc
 fi
-
 if [ -f $HOME/buildsysrc ]; then
         #chmod a+x $HOME/buildsysrc
 	#echo $HOME/buildsysrc
@@ -139,7 +139,7 @@ do
 				echo "$os - $arch: $srpm"
 				echo mock $MOCKARGS -r ${os}-${arch} $REFFOLDER/${srpm}
 				time mock $MOCKARGS -r ${os}-${arch} $REFFOLDER/${srpm}
-				if [ -f /var/lib/mock/${os}-${arch}/state/status ] && grep done /var/lib/mock/${os}-${arch}/state/status
+				if [ -f $MOCKWORK/${os}-${arch}/state/status ] && grep done $MOCKWORK/${os}-${arch}/state/status
 				then
 					for VERSION in $VERSIONS
 					do
@@ -149,7 +149,7 @@ do
 							DEST=$BRANCH
 						fi
 						# Copy freeside RPMs for this version only
-						FILES=`ls -1 /var/lib/mock/${os}-${arch}/result/freeside*-${VERSION}-*.rpm | grep -v .src.rpm | tr '\n' ' '`
+						FILES=`ls -1 $MOCKWORK/${os}-${arch}/result/freeside*-${VERSION}-*.rpm | grep -v .src.rpm | tr '\n' ' '`
 						echo $FILES
 						if [ "${FILES}x" != "x" ]
 						then
@@ -165,7 +165,7 @@ do
 							fi
 						fi
 						# Copy non-freeside RPMs to all versions
-						FILES=`ls -1 /var/lib/mock/${os}-${arch}/result/*.rpm | grep -v freeside | grep -v .src.rpm | tr '\n' ' '`
+						FILES=`ls -1 $MOCKWORK/${os}-${arch}/result/*.rpm | grep -v freeside | grep -v .src.rpm | tr '\n' ' '`
 						echo $FILES
 						if [ "${FILES}x" != "x" ]
 						then
@@ -186,3 +186,5 @@ do
 		done
 	done
 done
+
+echo "build-freeside done"
diff --git a/rpm/build/cvs-check-and-build b/rpm/build/cvs-check-and-build
index dbd300a5f..e8cd52104 100755
--- a/rpm/build/cvs-check-and-build
+++ b/rpm/build/cvs-check-and-build
@@ -40,5 +40,6 @@ done
 #cd /home/rsiddall/buildsys; ./build-freeside; ./refresh-repo $QUIET_FLAG
 
 ssh 10.5.4.5 ./build-from-cvs $FORCE_FLAG
+
 cd ~/buildsys; ./build-freeside; ./refresh-repo $QUIET_FLAG
 
diff --git a/rpm/build/mock/centos-5-i386.cfg b/rpm/build/mock/centos-5-i386.cfg
index c2deb1fa5..b4a7fbcc8 100644
--- a/rpm/build/mock/centos-5-i386.cfg
+++ b/rpm/build/mock/centos-5-i386.cfg
@@ -19,15 +19,15 @@ assumeyes=1
 
 [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
diff --git a/rpm/build/mock/centos-5-x86_64.cfg b/rpm/build/mock/centos-5-x86_64.cfg
index 448edc682..174136909 100644
--- a/rpm/build/mock/centos-5-x86_64.cfg
+++ b/rpm/build/mock/centos-5-x86_64.cfg
@@ -4,8 +4,38 @@ import os
 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 @@ exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghij
 
 [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@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@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
+#
+#"""
 
 
diff --git a/rpm/build/refresh-repo b/rpm/build/refresh-repo
index 40f62cdeb..32d07ad97 100755
--- a/rpm/build/refresh-repo
+++ b/rpm/build/refresh-repo
@@ -27,10 +27,18 @@ QUIET_FLAG=
 
 BUILDSYSDIR=`dirname $0`
 
+if [ -f $BUILDSYSDIR/buildsysrc ]; then
+        #chmod a+x $BUILDSYSDIR/buildsysrc
+	#echo $BUILDSYSDIR/buildsysrc
+	. $BUILDSYSDIR/buildsysrc
+fi
 if [ -f $HOME/buildsysrc ]; then
+        #chmod a+x $HOME/buildsysrc
+	#echo $HOME/buildsysrc
 	. $HOME/buildsysrc
 fi
 
+
 usage() {
 	echo "refresh-repo: refresh yum metadata for all yum repositories"
 	echo "where:"