From: Dan Mick <dan.mick@redhat.com>
Date: Fri, 2 Dec 2016 03:44:20 +0000 (-0800)
Subject: Pass CEPH_EXTRA_CMAKE_ARGS through sudo to pbuilder build
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f336cdd6f5e8e10d0aa8612562bbe4bd30511c6;p=ceph-build.git

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 872399e5..8c01bfc2 100644
--- 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 b024f324..a9088370 100644
--- 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 b024f324..a9088370 100644
--- 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 \