From: Gary Lowell <glowell@inktank.com>
Date: Mon, 17 Dec 2012 05:55:29 +0000 (-0800)
Subject: build_debs.sh:  Partial fix for building arch independent packages.
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d80f78adcb28a2c60fd79895f4f5c63d999b457d;p=ceph-build.git

build_debs.sh:  Partial fix for building arch independent packages.

We only want to build the architecture independent packages once.
The i386 platform has been picked for that, and by convention there
should only be one i386 host in the deb_hosts list.  For this host
the -b option is supplied in debbuildopts which builds the binary
(No source) version of arch dependent and independent packages.  For
all other hosts the pbuilder --binary-arch flag is supplied which
builds binary arch dependent packages only.
---

diff --git a/build_debs.sh b/build_debs.sh
index f19885a88..e5246a4bb 100755
--- a/build_debs.sh
+++ b/build_debs.sh
@@ -39,17 +39,27 @@ do
 #    $bindir/update_pbuilder.sh $pbuilddir $dist
 
     echo building debs for $dist
-    pbuilder build \
-	--binary-arch \
-	--distribution $dist \
-	--basetgz $pbuilddir/$dist.tgz \
-	--buildresult $releasedir/$cephver \
-	--debbuildopts "-j`grep -c processor /proc/cpuinfo`" \
-	$releasedir/$cephver/ceph_$bpvers.dsc
-    
+    if [ `dpkg-architecture -qDEB_BUILD_ARCH` = "i386" ] ; then
+        #  Binary only architecture dependent and independent
+        pbuilder build \
+            --distribution $dist \
+            --basetgz $pbuilddir/$dist.tgz \
+            --buildresult $releasedir/$cephver \
+            --debbuildopts "-j`grep -c processor /proc/cpuinfo` -b" \
+            $releasedir/$cephver/ceph_$bpvers.dsc
+    else
+        #  Binary only architecture dependent
+        pbuilder build \
+            --binary-arch \
+            --distribution $dist \
+            --basetgz $pbuilddir/$dist.tgz \
+            --buildresult $releasedir/$cephver \
+            --debbuildopts "-j`grep -c processor /proc/cpuinfo`" \
+            $releasedir/$cephver/ceph_$bpvers.dsc
+    fi
+ 
 done
 
-
 # do lintian checks
 for dist in $dists
 do