cmake changes #10112
Merged
cmake changes #10112
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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>
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>
…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>
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>
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>
* 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>
* 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>
…tutils_install_cython_module Signed-off-by: Kefu Chai <kchai@redhat.com>
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>
should not depend on them if SSE3 and/or SSE4 is not around. Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
| @@ -1091,7 +1091,6 @@ install(PROGRAMS | |||
| ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph-post-file | |||
| ${CMAKE_SOURCE_DIR}/src/ceph-run | |||
| ${CMAKE_SOURCE_DIR}/src/ceph-rest-api | |||
| ${CMAKE_SOURCE_DIR}/src/vstart.sh | |||
There was a problem hiding this comment.
it's a developer only script. and only cmake installs it. so no. even if some of us are using it, i'd recommend him/her to run it from the source tree.
There was a problem hiding this comment.
Ah I didn't know only cmake installed it. Let's take it out
|
This looks good to me. Should I merge, or is there more testing that needs to happen on this branch? From what I understand the make-check failures could not be due to this PR. |
|
yes, please. actually they are the result of the tests. and if you get a chance, #10016 is also ready for review. thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.