From: Michael Fritch <mfritch@suse.com>
Date: Wed, 17 Nov 2021 23:19:40 +0000 (-0700)
Subject: rpm, debian: use cmake to install the cephadm binary
X-Git-Tag: v18.0.0~7^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f756b3cfcc94bf1d450baddd784479579f63cd91;p=ceph.git

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 fd20f35bafbf..6823be99dca0 100644
--- 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 6303fbb2e75d..c163daad2c2a 100755
--- 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 9986169179e0..464372debaa4 100644
--- 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})