Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cmake changes #10112

Merged
merged 11 commits into from Jul 5, 2016
Merged

cmake changes #10112

merged 11 commits into from Jul 5, 2016

Commits on Jul 2, 2016

  1. cmake: install python srcs into platform-independent dir 

    otherwise they will be installed into
$PREFIX/lib64/python2.7/site-packages instead of
$PREFIX/lib/python2.7/site-packages on amd64 arch.

Signed-off-by: Kefu Chai <kchai@redhat.com>
    @tchaikov
    tchaikov committed Jul 2, 2016
    Copy the full SHA
    383bee9 View commit details
    Browse the repository at this point in the history

  2. cmake: install lib{rgw,cephfs_jni} into ${CMAKE_INSTALL_LIBDIR} not lib 

    rh and suse distros follows FHS and put amd64 dso libs into lib64 on
amd64 machines. so let's use ${CMAKE_INSTALL_LIBDIR} instead

Signed-off-by: Kefu Chai <kchai@redhat.com>
    @tchaikov
    tchaikov committed Jul 2, 2016
    Copy the full SHA
    2c4709b View commit details
    Browse the repository at this point in the history

  3. cmake install ceph-monstore-update-crush.sh into ${CMAKE_INSTALL_LIBD… 

    …IR}/ceph

ceph-monstore-update-crush.sh is a user-facing script, and it is not
used internally. also ceph.spec expects it that way. technically, we
should not install arch-indep files into ${CMAKE_INSTALL_LIBDIR}/ceph.
leave this for another changeset..

this partially reverts 37f53ec

Signed-off-by: Kefu Chai <kchai@redhat.com>
    @tchaikov
    tchaikov committed Jul 2, 2016
    Copy the full SHA
    d4d3ee1 View commit details
    Browse the repository at this point in the history

  4. cmake: do not install intermediate libs 

    rbd_replay and rbd_replay_ios are convenience libraries, and they are
not supposed to be used by user.

Signed-off-by: Kefu Chai <kchai@redhat.com>
    @tchaikov
    tchaikov committed Jul 2, 2016
    Copy the full SHA
    f8f282e View commit details
    Browse the repository at this point in the history

  5. cmake: version libcephfs_jni 

    so we have libcephfs_jni.so.1.0.0 and libcephfs_jni.so.1, which are
expected by ceph.spec

Signed-off-by: Kefu Chai <kchai@redhat.com>
    @tchaikov
    tchaikov committed Jul 2, 2016
    Copy the full SHA
    f5d9128 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2016

  1. cmake: do not install unpackaged stuff 

    * doc/start/ceph.conf: it was installed as /etc/ceph.conf.example.
  but it's unexpected, and ceph.spec does not packages it.
* vstart.sh: this is for development usage. no need to package it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
    @tchaikov
    tchaikov committed Jul 4, 2016
    Copy the full SHA
    313ab1b View commit details
    Browse the repository at this point in the history

  2. cmake: install python packages into $CMAKE_INSTALL_PREFIX 

    * Distutils.cmake:
  set --prefix=${CMAKE_INSTALL_PREFIX} for python packages installed using
  setuptools. it was set to --prefix=/user only when $DESTDIR is set. so
  if user installs ceph using -DCMAKE_INSTALL_PREFIX, these python
  packages still go to /usr, which is unexpected.
* ceph-disk/CMakeLists.txt:
  install script into ${CMAKE_INSTALL_SBINDIR} instead of /usr/sbin

Signed-off-by: Kefu Chai <kchai@redhat.com>
    @tchaikov
    tchaikov committed Jul 4, 2016
    Copy the full SHA
    8c9ff9c View commit details
    Browse the repository at this point in the history

  3. cmake: refactor distutils_install_module to follow the pattern of dis… 

    …tutils_install_cython_module

Signed-off-by: Kefu Chai <kchai@redhat.com>
    @tchaikov
    tchaikov committed Jul 4, 2016
    Copy the full SHA
    0c5fb82 View commit details
    Browse the repository at this point in the history

  4. cmake: do not link libglobal with lttng-ust 

    only link tracing libraries with lttng-ust, this fixes selinux denial
errors at run-time:

SELinux denials found on ubuntu@mira054.front.sepia.ceph.com: ['type=AVC
msg=audit(1467543917.770:131781): avc: denied { open } for pid=17511
comm="ceph-mon" path="/dev/shm/lttng-ust-wait-5" dev="tmpfs" ino=75199
scontext=system_u:system_r:ceph_t:s0
tcontext=system_u:object_r:tmpfs_t:s0 tclass=file', 'type=AVC
msg=audit(1467543914.518:131756): avc: denied { open } for pid=17418
comm="ceph-osd" path="/dev/shm/lttng-ust-wait-5" dev="tmpfs" ino=75199
scontext=system_u:system_r:ceph_t:s0
tcontext=system_u:object_r:tmpfs_t:s0 tclass=file', 'type=AVC
msg=audit(1467543917.770:131781): avc: denied { read } for pid=17511
comm="ceph-mon" name="lttng-ust-wait-5" dev="tmpfs" ino=75199
scontext=system_u:system_r:ceph_t:s0
tcontext=system_u:object_r:tmpfs_t:s0 tclass=file', 'type=AVC
msg=audit(1467543914.518:131756): avc: denied { read } for pid=17418
comm="ceph-osd" name="lttng-ust-wait-5" dev="tmpfs" ino=75199
scontext=system_u:system_r:ceph_t:s0
tcontext=system_u:object_r:tmpfs_t:s0 tclass=file']

Signed-off-by: Kefu Chai <kchai@redhat.com>
    @tchaikov
    tchaikov committed Jul 4, 2016
    Copy the full SHA
    e8fa03d View commit details
    Browse the repository at this point in the history

  5. cmake: do not depend on sse jerasure plugins if not avaiable 

    should not depend on them if SSE3 and/or SSE4 is not around.

Signed-off-by: Kefu Chai <kchai@redhat.com>
    @tchaikov
    tchaikov committed Jul 4, 2016
    Copy the full SHA
    e1f67bd View commit details
    Browse the repository at this point in the history

  6. cmake: add ceph-{disk,detect-init} to ALL 

    Signed-off-by: Kefu Chai <kchai@redhat.com>
    @tchaikov
    tchaikov committed Jul 4, 2016
    Copy the full SHA
    19c0731 View commit details
    Browse the repository at this point in the history