]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: package mkcephfs on EL6 4924/head
authorKen Dreyer <kdreyer@redhat.com>
Wed, 10 Jun 2015 21:43:41 +0000 (15:43 -0600)
committerKen Dreyer <kdreyer@redhat.com>
Wed, 10 Jun 2015 21:51:12 +0000 (15:51 -0600)
Commit efbca0465c2946e113771966df08cf7cf37b1196 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>
ceph.spec.in

index 5380a58547c8b9885f195a1bd28ce53b8a8ca9e2..b1372aa422a5cc3554d47f62bd2ac284d5489665 100644 (file)
@@ -448,10 +448,11 @@ fi
 %{_sbindir}/ceph-disk-udev
 %{_sbindir}/ceph-create-keys
 %{_sbindir}/rcceph
-%{_sbindir}/mkcephfs
 %if 0%{?rhel} >= 7 || 0%{?fedora}
+%{_sbindir}/mkcephfs
 %{_sbindir}/mount.ceph
 %else
+/sbin/mkcephfs
 /sbin/mount.ceph
 %endif
 %dir %{_libdir}/ceph