[freeside-commits] freeside/rpm/build build-freeside, 1.3, 1.4 cvs-check-and-build, 1.2, 1.3 refresh-repo, 1.1, 1.2

[Ivan,,,]

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

Modified Files:
	build-freeside cvs-check-and-build refresh-repo 
Log Message:
generating RPMS, RT#8190

Index: cvs-check-and-build
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rpm/build/cvs-check-and-build,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- cvs-check-and-build	8 Jul 2010 09:32:14 -0000	1.2
+++ cvs-check-and-build	8 Jul 2010 21:28:58 -0000	1.3
@@ -40,5 +40,6 @@
 #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
 

Index: build-freeside
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rpm/build/build-freeside,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- build-freeside	8 Jul 2010 09:32:14 -0000	1.3
+++ build-freeside	8 Jul 2010 21:28:58 -0000	1.4
@@ -20,16 +20,16 @@
 
 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 @@
 				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 @@
 							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 @@
 							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 @@
 		done
 	done
 done
+
+echo "build-freeside done"

Index: refresh-repo
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rpm/build/refresh-repo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- refresh-repo	7 Jul 2010 17:51:58 -0000	1.1
+++ refresh-repo	8 Jul 2010 21:28:58 -0000	1.2
@@ -27,10 +27,18 @@
 
 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:"