From: Kefu Chai <kchai@redhat.com>
Date: Tue, 30 Jun 2020 08:14:16 +0000 (+0800)
Subject: rpm: package crimson-osd in ceph-osd
X-Git-Tag: wip-pdonnell-testing-20200918.022351~789^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8f1620b3c9322a518ba8b8c6573435d81b9c0756;p=ceph-ci.git

rpm: package crimson-osd in ceph-osd

in hope to simplify the enabling of crimson-osd. as we will use cephadm
as the way for deploying crimson-osd in future. it's unlikely we will
have classic osd and crimson osd co-located in the same system. so
this is most simple way to enable crimson-osd with minimum efforts.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 258fb613b0f..9f95c16c88b 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1199,6 +1199,12 @@ make DESTDIR=%{buildroot} install
 # we have dropped sysvinit bits
 rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph
 popd
+
+%if 0%{with seastar}
+# package crimson-osd with the name of ceph-osd
+install -m 0755 %{buildroot}%{_bindir}/crimson-osd %{buildroot}%{_bindir}/ceph-osd
+%endif
+
 install -m 0644 -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap
 %if 0%{?fedora} || 0%{?rhel}
 install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph