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

makefile: fix rbdmap manpage #8310

Merged
merged 2 commits into from Mar 25, 2016
Merged

makefile: fix rbdmap manpage #8310

merged 2 commits into from Mar 25, 2016

Conversation

tchaikov
Copy link
Contributor

@tchaikov
Copy link
Contributor Author

pushed to gitbuilder also for testing.

@tchaikov tchaikov changed the title Wip fix rbdmap manpage makefile: fix rbdmap manpage Mar 25, 2016
@tchaikov
autotools: add rbdmap to dist_man_MANS
1287846 
this fixes the rpm/deb build failure
was introduced by 20c8650

Signed-off-by: Kefu Chai <kchai@redhat.com>
smithfarm
smithfarm reviewed Mar 25, 2016
View reviewed changes
man/CMakeLists.txt
rbdmap.8
DESTINATION ${CEPH_MAN_DIR}/man8)
rbd.8
Copy link
Contributor

Choose a reason for hiding this comment

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

increase indent here, so it lines up with rbdmap.8 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oh, tab versus spaces. tab stop = 4, fixing.

@tchaikov
cmake: conditionally install man pages
3b551e6 
this matches its counterpart in automake
* install fuse related man pages only if HAVE_LIBFUSE
* install rbd related man pages only if WITH_RBD

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov
Copy link
Contributor Author

changelog

  • use tab instead of spaces for indent.

@liewegas
Copy link
Member

lgtm, merge once gitbuilders are happy?

@tchaikov
Copy link
Contributor Author

gitbuilders are almost happy, we still need #8293 to appease them.

@tchaikov tchaikov merged commit e82dd05 into ceph:master Mar 25, 2016
@tchaikov
Copy link
Contributor Author 

Checking for unpackaged file(s): /usr/lib/rpm/check-files /srv/autobuild-ceph/gitbuilder.git/build/rpmbuild/BUILDROOT/ceph-10.0.5-2814.gc1efc63.el7.x86_64
error: Installed (but unpackaged) file(s) found:
/etc/cron.hourly/subman.pyc
/etc/cron.hourly/subman.pyo
RPM build errors:
Installed (but unpackaged) file(s) found:
/etc/cron.hourly/subman.pyc
/etc/cron.hourly/subman.pyo

@tchaikov tchaikov deleted the wip-fix-rbdmap-manpage branch March 25, 2016 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bug-fix build/ops
Projects
None yet
Milestone
No milestone
3 participants
@tchaikov @liewegas @smithfarm