projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
checking in more of the rpm build system (is that it?)
[freeside.git]
/
rpm
/
build
/
build-freeside
diff --git
a/rpm/build/build-freeside
b/rpm/build/build-freeside
index
8ea0392
..
f4c6ca7
100755
(executable)
--- a/
rpm/build/build-freeside
+++ b/
rpm/build/build-freeside
@@
-17,14
+17,30
@@
CENTOSVERS='5'
SLESVERS=10
WHICHVERS=
ARCHS='i386 x86_64'
SLESVERS=10
WHICHVERS=
ARCHS='i386 x86_64'
-MOCKARGS='--autocache'
BUILDSYSDIR=`dirname $0`
BUILDSYSDIR=`dirname $0`
+#MOCKARGS='--autocache'
+MOCKARGS="--configdir=$BUILDSYSDIR/mock"
+
+
+if [ -f $BUILDSYSDIR/buildsysrc ]; then
+ #chmod a+x $BUILDSYSDIR/buildsysrc
+ #echo $BUILDSYSDIR/buildsysrc
+ . $BUILDSYSDIR/buildsysrc
+fi
+
if [ -f $HOME/buildsysrc ]; then
if [ -f $HOME/buildsysrc ]; then
+ #chmod a+x $HOME/buildsysrc
+ #echo $HOME/buildsysrc
. $HOME/buildsysrc
fi
. $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:"
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
done
if [ "${SRCFOLDER}x" = "x" ]; then
- echo "No source folder defined!"
+ PWD=`pwd`
+ echo "No source folder defined! (BUILDSYSDIR=$BUILDSYSDIR pwd=$PWD)"
exit
fi
exit
fi
@@
-120,6
+137,7
@@
do
for arch in $ARCHS
do
echo "$os - $arch: $srpm"
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
then
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
then
@@
-137,7
+155,7
@@
do
then
for FILE in $FILES
do
then
for FILE in $FILES
do
- $
BUILDSYSDIR/expect-addsign
$FILE
+ $
EXPECT_ADDSIGN
$FILE
done
if [ "${REPOMACHINE}x" != "x" ]
then
done
if [ "${REPOMACHINE}x" != "x" ]
then
@@
-153,7
+171,7
@@
do
then
for FILE in $FILES
do
then
for FILE in $FILES
do
- $
BUILDSYSDIR/expect-addsign
$FILE
+ $
EXPECT_ADDSIGN
$FILE
done
if [ "${REPOMACHINE}x" != "x" ]
then
done
if [ "${REPOMACHINE}x" != "x" ]
then