]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-build: remove the --binary-arch flag when calling pbuilder 489/head
authorAlfredo Deza <adeza@redhat.com>
Tue, 27 Sep 2016 18:37:40 +0000 (14:37 -0400)
committerAlfredo Deza <adeza@redhat.com>
Tue, 27 Sep 2016 19:34:50 +0000 (15:34 -0400)
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>
ceph-build/build/build_deb

index 2a939c473ee70d3207261d99a6fcd96c38bd2499..f98034ad814ca56be21d5d5edb780794f8a591b2 100644 (file)
@@ -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