From: Dan Mick <dan.mick@redhat.com>
Date: Tue, 15 Nov 2016 03:50:08 +0000 (-0800)
Subject: ceph{-dev}-{setup,build}: pass CMAKE_EXTRA_CONFIG_ARGS
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F541%2Fhead;p=ceph-build.git

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>
---

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 2f8065394..c5c01e2c3 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 b9f303722..8b3b3d821 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 59ce06bac..47d662656 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 4c5672390..357959628 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