build/ops: ceph.spec.in: package mkcephfs on EL6 #4924
Merged
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
Commit efbca04 added mkcephfs to the RPM %files listing, but this /usr/sbin path is only correct for CentOS 7. In CentOS 6, the utility is present at /sbin/mkcephfs instead. This causes rpmbuild to fail to build the tip of the firefly branch on EL6. Adjust the RPM %files list so we properly package mkcephfs on both EL7 and EL6. http://tracker.ceph.com/issues/11955 Refs: #11955 Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
liewegas
added a commit
that referenced
this pull request
Jun 10, 2015
11955: ceph.spec.in: package mkcephfs on EL6 Reviewed-by: Sage Weil <sage@redhat.com>
ghost
changed the title
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.
Commit efbca04 added
mkcephfsto the RPM%fileslisting, but this/usr/sbinpath is only correct for CentOS 7. In CentOS 6, the utility is present at/sbin/mkcephfsinstead. This causes rpmbuild to fail to build the tip of the firefly branch on EL6.This pull request adjusts the RPM
%fileslist so we properly package mkcephfs on both EL7 and EL6.http://tracker.ceph.com/issues/11955