rpm, debian: use cmake to install the cephadm binary

Signed-off-by: Michael Fritch <mfritch@suse.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index fd20f35bafbf6a7de4c1509ea50b7258a217f2e1..6823be99dca00413bc6577be05eee3f7d0ec7840 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1475,7 +1475,6 @@ install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING
 install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
 install -m 0755 -D src/tools/rbd_nbd/rbd-nbd_quiesce %{buildroot}%{_libexecdir}/rbd-nbd/rbd-nbd_quiesce
 
-install -m 0755 src/cephadm/cephadm %{buildroot}%{_sbindir}/cephadm
 mkdir -p %{buildroot}%{_sharedstatedir}/cephadm
 chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm
 mkdir -p %{buildroot}%{_sharedstatedir}/cephadm/.ssh

diff --git a/debian/rules b/debian/rules
index 6303fbb2e75dfde06ffe093488b6f91bed7b3a8f..c163daad2c2a8bb6ba8f3f0285bc2672a21bdd0d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -81,8 +81,6 @@ override_dh_auto_install:
        install -D -m 440 sudoers.d/ceph-smartctl $(DESTDIR)/etc/sudoers.d/ceph-smartctl
        install -D -m 755 src/tools/rbd_nbd/rbd-nbd_quiesce $(DESTDIR)/usr/libexec/rbd-nbd/rbd-nbd_quiesce
 
-       install -m 755 src/cephadm/cephadm $(DESTDIR)/usr/sbin/cephadm
-
        install -m 644 -D monitoring/ceph-mixin/prometheus_alerts.yml $(DESTDIR)/etc/prometheus/ceph/ceph_default_alerts.yml
 
 # doc/changelog is a directory, which confuses dh_installchangelogs

diff --git a/src/cephadm/CMakeLists.txt b/src/cephadm/CMakeLists.txt
index 9986169179e08a6014de8cc9238e378129dc9b79..464372debaa4d3bcbb8e8baf1e1e39bce0397f1c 100644 (file)
--- a/src/cephadm/CMakeLists.txt
+++ b/src/cephadm/CMakeLists.txt
@@ -3,7 +3,7 @@ if(WITH_TESTS)
   add_tox_test(cephadm TOX_ENVS py3 mypy flake8)
 endif()
 
-set(bin_target_file ${CMAKE_BINARY_DIR}/bin/cephadm)
+set(bin_target_file ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cephadm)
 
 add_custom_command(
   OUTPUT "${bin_target_file}"
@@ -14,3 +14,7 @@ add_custom_command(
 
 add_custom_target(cephadm ALL
   DEPENDS "${bin_target_file}")
+
+install(PROGRAMS
+  ${bin_target_file}
+  DESTINATION ${CMAKE_INSTALL_SBINDIR})