From 5f336cdd6f5e8e10d0aa8612562bbe4bd30511c6 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Thu, 1 Dec 2016 19:44:20 -0800 Subject: [PATCH] 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 --- ceph-build/build/build_deb | 6 ++++-- ceph-dev-build/build/build_deb | 5 ++++- ceph-dev-new-build/build/build_deb | 5 ++++- 3 files changed, 12 insertions(+), 4 deletions(-) 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 \ -- 2.39.5