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

rbd: fix build with "--without-rbd" #6899

Merged
merged 1 commit into from Dec 14, 2015

Conversation

branch-predictor
Copy link
Contributor

It's not possible to build Ceph configured with "--without-rbd", as
tests and FileStore depends on components provided by RBD. This changeset
fixes this.

Fixes: #14058
Signed-off-by: Piotr Dałek piotr.dalek@ts.fujitsu.com

@ghost ghost self-assigned this Dec 11, 2015
@ghost
Copy link

ghost commented Dec 11, 2015

nice catch :-)

@@ -433,9 +433,11 @@ bin_DEBUGPROGRAMS += ceph_test_objectcacher_stress
ceph_test_cfuse_cache_invalidate_SOURCES = test/test_cfuse_cache_invalidate.cc
bin_DEBUGPROGRAMS += ceph_test_cfuse_cache_invalidate

if WITH_RBD
Copy link
Member

Choose a reason for hiding this comment

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

seems should match src/common/Makefile.am, and just check for LINUX

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right.

@ghost ghost assigned jdurgin and unassigned ghost Dec 14, 2015
It's not possible to build Ceph configured with "--without-rbd", as
tests and FileStore depends on components provided by RBD. This changeset
fixes this.

Fixes: ceph#14058
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
jdurgin added a commit that referenced this pull request Dec 14, 2015
rbd: fix build with "--without-rbd"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
@jdurgin jdurgin merged commit 16ba826 into ceph:master Dec 14, 2015
@branch-predictor branch-predictor deleted the bp-fix-no-rbd-build branch May 22, 2016 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants