]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #10161 from ceph/wip-dang-cmake
authorKefu Chai <tchaikov@gmail.com>
Wed, 13 Jul 2016 16:52:17 +0000 (00:52 +0800)
committerGitHub <noreply@github.com>
Wed, 13 Jul 2016 16:52:17 +0000 (00:52 +0800)
CMake - stop pip checking for updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/ceph-detect-init/CMakeLists.txt
src/ceph-disk/CMakeLists.txt

index d7e0f5b7b83086d11ebbf909c28b830c66e55826,952eb3aeae2c08ced540738c288c6c0241d37d17..a3a94c888879a34530dfebff9221cf9e31410982
@@@ -1,9 -1,9 +1,9 @@@
  set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv)
  
 -add_custom_target(ceph-detect-init ALL
 +add_custom_target(ceph-detect-init
    COMMAND
    ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh ${CEPH_DETECT_INIT_VIRTUALENV} &&
-   ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --use-wheel --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
+   ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --disable-pip-version-check --no-index --use-wheel --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-detect-init
    COMMENT "ceph-detect-init is being created")
  
index c57ef446cf1f12d6b3ed45611324cc55f975b03b,5eae06ed765d39d46460b1b5235cdf5f50cb64d4..5db62337eaa724c37368205470455ad74f2ea570
@@@ -1,9 -1,9 +1,9 @@@
  set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv)
  
 -add_custom_target(ceph-disk ALL
 +add_custom_target(ceph-disk
    COMMAND
    ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh ${CEPH_DISK_VIRTUALENV} &&
-   ${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --use-wheel --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
+   ${CEPH_DISK_VIRTUALENV}/bin/pip install --disable-pip-version-check --no-index --use-wheel --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk
    COMMENT "ceph-disk is being created")