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 2f8065394b12dcdf075d57fd8449fa5b6c58c45a..c5c01e2c3b0fd970fd6e7a4a04022fe7b00e2b72 100644 (file)
--- 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 b9f303722c18930d2efe1dec4a2fa36b2b1fec32..8b3b3d82199a73662b05a54e26077541066f3fcf 100644 (file)
--- 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 59ce06bacbfa0f99802217597750d3c0c0044c58..47d6626561893c8eb2f2353469e535c2661d298a 100644 (file)
--- 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 4c567239006a683d7f136819fe733127ed5190ca..357959628cd6adebba51cd60324fcbbd77bce342 100644 (file)
--- 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