From 67abe9c49a56102433135a2bdcedfb55c9224f99 Mon Sep 17 00:00:00 2001 From: Matthew Vernon Date: Wed, 20 Sep 2023 16:33:13 +0100 Subject: [PATCH] debian: radosgw.init to installinit, remove auto_build override Installation of init scripts properly belongs with dh_installinit, so move the installation there. That means we no longer need the override of dh_auto_build, which simplifies the rules file. Signed-off-by: Matthew Vernon --- debian/rules | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index ede1daf4786da..fd025b7c91789 100755 --- a/debian/rules +++ b/debian/rules @@ -64,10 +64,6 @@ override_dh_auto_configure: env | sort dh_auto_configure --buildsystem=cmake -- $(extraopts) $(CEPH_EXTRA_CMAKE_ARGS) -override_dh_auto_build: - dh_auto_build --buildsystem=cmake - cp src/init-radosgw debian/radosgw.init - override_dh_auto_clean: dh_auto_clean --buildsystem=cmake rm -f debian/radosgw.init debian/ceph.logrotate debian/ceph-base.docs @@ -91,6 +87,7 @@ override_dh_installlogrotate: dh_installlogrotate -pceph-common override_dh_installinit: + cp src/init-radosgw debian/radosgw.init # install the systemd stuff manually since we have funny service names install -d -m0755 debian/ceph-common/etc/default install -m0644 etc/default/ceph debian/ceph-common/etc/default/ @@ -147,4 +144,4 @@ override_dh_python3: # do not run tests override_dh_auto_test: -.PHONY: override_dh_autoreconf override_dh_auto_configure override_dh_auto_build override_dh_auto_clean override_dh_auto_install override_dh_installlogrotate override_dh_installinit override_dh_strip override_dh_auto_test +.PHONY: override_dh_autoreconf override_dh_auto_configure override_dh_auto_clean override_dh_auto_install override_dh_installlogrotate override_dh_installinit override_dh_strip override_dh_auto_test -- 2.39.5