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.

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

cmake changes #10059

Merged
merged 5 commits into from Jun 30, 2016
Merged

cmake changes #10059

merged 5 commits into from Jun 30, 2016

Conversation

@@ -0,0 +1,16 @@
install(FILES
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rpm packaging relies on the building system to put these files in place.

qa task rados/objectstore/keyvaluedb.yaml uses it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
add an option "WITH_SYSTEMD", off by default

Signed-off-by: Kefu Chai <kchai@redhat.com>
this address rpm build failures on amd64 platforms:

Directory not found:
/srv/autobuild-ceph/gitbuilder.git/build/rpmbuild/BUILDROOT/ceph-11.0.0-119.gcd3ee3c.x86_64/usr/lib64/rados-classes
File not found by glob:
/srv/autobuild-ceph/gitbuilder.git/build/rpmbuild/BUILDROOT/ceph-11.0.0-119.gcd3ee3c.x86_64/usr/lib64/rados-classes/*
File not found by glob:
/srv/autobuild-ceph/gitbuilder.git/build/rpmbuild/BUILDROOT/ceph-11.0.0-119.gcd3ee3c.x86_64/usr/lib64/libos_tp.so*
File not found by glob:
/srv/autobuild-ceph/gitbuilder.git/build/rpmbuild/BUILDROOT/ceph-11.0.0-119.gcd3ee3c.x86_64/usr/lib64/libosd_tp.so*

Signed-off-by: Kefu Chai <kchai@redhat.com>
was using selinux/devel/include/Makefile, which was wrong.

Signed-off-by: Kefu Chai <kchai@redhat.com>
@@ -63,6 +63,7 @@ if(WITH_RBD)
rbd-nbd.rst
rbd-replay-prep.rst
rbd-replay.rst
rbd-replay.rst
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line is duplicated

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed and repushed

rpm packaging needs it explicitly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
@alimaredia alimaredia merged commit 789fb17 into ceph:master Jun 30, 2016
@tchaikov tchaikov deleted the wip-cmake branch June 30, 2016 16:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants