X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rpm%2Fbuild%2Fbuild-freeside;h=afef96ab6347c2d101fd81f4d26a7edb05384b1d;hp=8ea0392a3bedbefd6f53420c820c8348d1171a4c;hb=d61cf1825f89216eebc83da5510c34b330b55abb;hpb=4aaf110cfc6a634de7b7015e352a798e8e8aeff3

diff --git a/rpm/build/build-freeside b/rpm/build/build-freeside
index 8ea0392a3..afef96ab6 100755
--- a/rpm/build/build-freeside
+++ b/rpm/build/build-freeside
@@ -17,14 +17,30 @@ CENTOSVERS='5'
 SLESVERS=10
 WHICHVERS=
 ARCHS='i386 x86_64'
-MOCKARGS='--autocache'
 
 BUILDSYSDIR=`dirname $0`
 
+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
 	. $HOME/buildsysrc
 fi
 
+EXPECT_ADDSIGN=$BUILDSYSDIR/expect-addsign
+if [ -f /usr/local/bin/expect-addsign ]; then
+   EXPECT_ADDSIGN=/usr/local/bin/expect-addsign
+fi
+
 usage() {
 	echo "build-freeside: build RPMs for all target distros and architectures using mock"
 	echo "where:"
@@ -72,7 +88,8 @@ do
 done
 
 if [ "${SRCFOLDER}x" = "x" ]; then
-	echo "No source folder defined!"
+        PWD=`pwd`
+	echo "No source folder defined! (BUILDSYSDIR=$BUILDSYSDIR pwd=$PWD)"
 	exit
 fi
 
@@ -120,8 +137,9 @@ do
 			for arch in $ARCHS
 			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 true #[ -f $MOCKWORK/${os}-${arch}/state/status ] && grep done $MOCKWORK/${os}-${arch}/state/status
 				then
 					for VERSION in $VERSIONS
 					do
@@ -131,13 +149,14 @@ 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' ' '`
+						FILES=`ls -1 $MOCKWORK/freeside*-${VERSION}-*.rpm | grep -v .src.rpm | tr '\n' ' '`
 						echo $FILES
 						if [ "${FILES}x" != "x" ]
 						then
 							for FILE in $FILES
 							do
-								$BUILDSYSDIR/expect-addsign $FILE
+								$EXPECT_ADDSIGN $FILE
 							done
 							if [ "${REPOMACHINE}x" != "x" ]
 							then
@@ -147,13 +166,14 @@ 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' ' '`
+						FILES=`ls -1 $MOCKWORK/*.rpm | grep -v freeside | grep -v .src.rpm | tr '\n' ' '`
 						echo $FILES
 						if [ "${FILES}x" != "x" ]
 						then
 							for FILE in $FILES
 							do
-								$BUILDSYSDIR/expect-addsign $FILE
+								$EXPECT_ADDSIGN $FILE
 							done
 							if [ "${REPOMACHINE}x" != "x" ]
 							then
@@ -168,3 +188,5 @@ do
 		done
 	done
 done
+
+echo "build-freeside done"