From 155ba88917f388a1449065dc469c680d0d5d8abf Mon Sep 17 00:00:00 2001
From: Dan Mick <dan.mick@redhat.com>
Date: Mon, 14 Nov 2016 19:50:08 -0800
Subject: [PATCH] ceph{-dev}-{setup,build}: pass CMAKE_EXTRA_CONFIG_ARGS

Inject another file, this one a 'catchall' of other environment variables
that -setup may need to pass to -build.  At the moment, that contains
CEPH_EXTRA_CMAKE_ARGS, but there doesn't seem to be much point in creating
one file per variable.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---
 ceph-build/config/definitions/ceph-build.yml         | 2 ++
 ceph-dev-build/config/definitions/ceph-dev-build.yml | 2 ++
 ceph-dev-setup/build/build                           | 4 ++++
 ceph-setup/build/build                               | 4 ++++
 4 files changed, 12 insertions(+)

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 2f806539..c5c01e2c 100644
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -57,6 +57,8 @@
           which-build: multijob-build
       - inject:
           properties-file: ${WORKSPACE}/dist/sha1
+      - inject:
+          properties-file: ${WORKSPACE}/dist/other_envvars
       # debian build scripts
       - shell:
           !include-raw:
diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml
index b9f30372..8b3b3d82 100644
--- a/ceph-dev-build/config/definitions/ceph-dev-build.yml
+++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml
@@ -62,6 +62,8 @@
           properties-file: ${WORKSPACE}/dist/sha1
       - inject:
           properties-file: ${WORKSPACE}/dist/branch
+      - inject:
+          properties-file: ${WORKSPACE}/dist/other_envvars
       # debian build scripts
       - shell:
           !include-raw:
diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build
index 59ce06ba..47d66265 100644
--- a/ceph-dev-setup/build/build
+++ b/ceph-dev-setup/build/build
@@ -198,3 +198,7 @@ EOF
 cat > dist/branch << EOF
 BRANCH=${BRANCH}
 EOF
+
+cat > dist/other_envvars << EOF
+CEPH_EXTRA_CMAKE_ARGS="${CEPH_EXTRA_CMAKE_ARGS}"
+EOF
diff --git a/ceph-setup/build/build b/ceph-setup/build/build
index 4c567239..35795962 100644
--- a/ceph-setup/build/build
+++ b/ceph-setup/build/build
@@ -183,3 +183,7 @@ mv release/version dist/.
 cat > dist/sha1 << EOF
 SHA1=${GIT_COMMIT}
 EOF
+
+cat > dist/other_envvars << EOF
+CEPH_EXTRA_CMAKE_ARGS="${CEPH_EXTRA_CMAKE_ARGS}"
+EOF
-- 
2.39.5