Pass CEPH_EXTRA_CMAKE_ARGS through sudo to pbuilder build

This should finally allow notcmalloc builds on debian.

Setting the variable on the sudo command line does affect the
resulting pbuilder debian/rules execution (tested with a dummy
debian package)

Signed-off-by: Dan Mick <dan.mick@redhat.com>

diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb
index 872399e5fd624e241fb704ad9771df1801b1be65..8c01bfc283444efd2471a1ee0f534b342a3fb9a3 100644 (file)
--- a/ceph-build/build/build_deb
+++ b/ceph-build/build/build_deb
@@ -72,8 +72,10 @@ echo deb vers $bpvers
 
 
 echo building debs for $DIST
-#  Binary only architecture dependent
-sudo pbuilder build \
+# pass only those env vars specifically noted
+sudo \
+    CEPH_EXTRA_CMAKE_ARGS=$CEPH_EXTRA_CMAKE_ARGS \
+    pbuilder build \
     --distribution $DIST \
     --basetgz $pbuilddir/$DIST.tgz \
     --buildresult $releasedir/$cephver \

diff --git a/ceph-dev-build/build/build_deb b/ceph-dev-build/build/build_deb
index b024f3240613a01eeac5f5b268adff59c84695f6..a9088370d0e346968b59a84990551bd13bef9f51 100644 (file)
--- a/ceph-dev-build/build/build_deb
+++ b/ceph-dev-build/build/build_deb
@@ -72,7 +72,10 @@ echo deb vers $bpvers
 
 
 echo building debs for $DIST
-sudo pbuilder build \
+# pass only those env vars specifically noted
+sudo \
+    CEPH_EXTRA_CMAKE_ARGS=$CEPH_EXTRA_CMAKE_ARGS \
+    pbuilder build \
     --distribution $DIST \
     --basetgz $pbuilddir/$DIST.tgz \
     --buildresult $releasedir/$cephver \

diff --git a/ceph-dev-new-build/build/build_deb b/ceph-dev-new-build/build/build_deb
index b024f3240613a01eeac5f5b268adff59c84695f6..a9088370d0e346968b59a84990551bd13bef9f51 100644 (file)
--- a/ceph-dev-new-build/build/build_deb
+++ b/ceph-dev-new-build/build/build_deb
@@ -72,7 +72,10 @@ echo deb vers $bpvers
 
 
 echo building debs for $DIST
-sudo pbuilder build \
+# pass only those env vars specifically noted
+sudo \
+    CEPH_EXTRA_CMAKE_ARGS=$CEPH_EXTRA_CMAKE_ARGS \
+    pbuilder build \
     --distribution $DIST \
     --basetgz $pbuilddir/$DIST.tgz \
     --buildresult $releasedir/$cephver \