From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 27 Sep 2016 18:37:40 +0000 (-0400)
Subject: ceph-build: remove the --binary-arch flag when calling pbuilder
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=70da9d5325b72493502e2e119b7fd894dc300760;p=ceph-build.git

ceph-build: remove the --binary-arch flag when calling pbuilder

This caused for non-binary arch to be skipped. Specifically:
"Build-Depends-Indep" which in this case is in charge of building
libcephfs-java.

The man page explains that the flag is used to: "Specify  to  build
architecture specific targets instead of all targets" which we need to.

This was introduced in commit: d80f78adcb28a2c60fd79895f4f5c63d999b457d

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb
index 2a939c47..f98034ad 100644
--- a/ceph-build/build/build_deb
+++ b/ceph-build/build/build_deb
@@ -164,24 +164,13 @@ echo deb vers $bpvers
 
 
 echo building debs for $DIST
-if [ `dpkg-architecture -qDEB_BUILD_ARCH` = "i386" ] ; then
-    #  Architecture dependent, independent and source
-    sudo pbuilder build \
-        --distribution $DIST \
-        --basetgz $pbuilddir/$DIST.tgz \
-        --buildresult $releasedir/$cephver \
-        --debbuildopts "-j`grep -c processor /proc/cpuinfo`" \
-        $releasedir/$cephver/ceph_$bpvers.dsc
-else
-    #  Binary only architecture dependent
-    sudo 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
+#  Binary only architecture dependent
+sudo pbuilder build \
+    --distribution $DIST \
+    --basetgz $pbuilddir/$DIST.tgz \
+    --buildresult $releasedir/$cephver \
+    --debbuildopts "-j`grep -c processor /proc/cpuinfo`" \
+    $releasedir/$cephver/ceph_$bpvers.dsc
 
 # do lintian checks
 echo lintian checks for $bpvers