X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=id-deb-build%2Fid-pbuild.sh;h=6676f9923c5bdb74c6dae839ac24608c1fb2ff90;hb=3460d0e0459b71f8c4bb86357c7184d60aa6f53b;hp=8e07f24c05e99c2b49650c877a8784522222637b;hpb=59bd10fb387c1460bf9438b27942bfc499944b98;p=git-tools-moved-to-github.git

diff --git a/id-deb-build/id-pbuild.sh b/id-deb-build/id-pbuild.sh
index 8e07f24..6676f99 100755
--- a/id-deb-build/id-pbuild.sh
+++ b/id-deb-build/id-pbuild.sh
@@ -11,8 +11,12 @@ Options:
 EOF
     exit $1
 }
+D0=`dirname $0`
+ID_DEB_BUILD=`cd $D0; pwd`
+
 do_help=false
 upload=false
+ARCHS="i386 amd64"
 while test $# -gt 0; do
     case "$1" in
         -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
@@ -40,7 +44,10 @@ done
 if test "$do_help" = "yes"; then
     usage 1 1>&2
 fi
-
+if test ! -x /usr/bin/lxc-attach; then
+    echo "No lxc-attach. Probably not running on mochi!!"
+    exit 1
+fi
 if test -f IDMETA;  then
     . ./IDMETA
 else
@@ -55,7 +62,6 @@ if test "$DEBIAN_DIST_A" -o "$UBUNTU_DIST_A" -o "$CENTOS_DIST_A"; then
     UBUNTU_DIST=$UBUNTU_DIST_A
     CENTOS_DIST=$CENTOS_DIST_A
 fi
-ID_DEB_BUILD=~/proj/git-tools/id-deb-build
 if test "$DEBIAN_DIST" -o "$UBUNTU_DIST"; then
     debian=true
     DNAME=`awk '/Source:/ {print $2}' debian/control`
@@ -76,6 +82,7 @@ if test "$CENTOS_DIST"; then
     fi
     PRODUCT=$RNAME
     if test ! -d ~/rpmbuild; then
+	echo "Creating ~/rpmbuild"
         mkdir -p ~/pmbuild/BUILD
         mkdir -p ~/rpmbuild/RPMS/noarch
         mkdir -p ~/rpmbuild/RPMS/x86_64
@@ -83,6 +90,12 @@ if test "$CENTOS_DIST"; then
         mkdir -p ~/rpmbuild/SPECS
         mkdir -p ~/rpmbuild/SRPMS
     fi
+    if test ! -f ~/.rpmmacros; then
+	echo "Creating ~/.rpmmacros"
+	echo "%_topdir $HOME/rpmbuild" >~/.rpmmacros
+	echo "%_source_filedigest_algorithm   0" >>~/.rpmmacros
+	echo "%_binary_filedigest_algorithm   0" >>~/.rpmmacros
+    fi
 else
     centos=false
 fi
@@ -209,7 +222,7 @@ if $debian; then
     if grep "Architecture: all" $DSC >/dev/null; then
 	USE_ARCHS=i386
     else
-	USE_ARCHS="i386 amd64"
+	USE_ARCHS=$ARCHS
     fi
     for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
 	for arch in ${USE_ARCHS}; do