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

build/ops: ceph.spec.in: package mkcephfs on EL6 #4924

Merged
merged 1 commit into from Jun 10, 2015

Conversation

Projects
None yet
3 participants
@ktdreyer
Member

ktdreyer commented Jun 10, 2015

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.

This pull request adjusts the RPM %files list so we properly package mkcephfs on both EL7 and EL6.

http://tracker.ceph.com/issues/11955

ceph.spec.in: package mkcephfs on EL6
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>

@ktdreyer ktdreyer added this to the firefly milestone Jun 10, 2015

liewegas added a commit that referenced this pull request Jun 10, 2015

Merge pull request #4924 from ceph/wip-11955-firefly
11955: ceph.spec.in: package mkcephfs on EL6

Reviewed-by: Sage Weil <sage@redhat.com>

@liewegas liewegas merged commit d1f4782 into firefly Jun 10, 2015

@liewegas liewegas deleted the wip-11955-firefly branch Jun 10, 2015

@ghost ghost changed the title from 11955: ceph.spec.in: package mkcephfs on EL6 to build/ops: ceph.spec.in: package mkcephfs on EL6 Jul 14, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment