debian: Use /usr/libexec for libexecdir

Debian has adopted FHS 3.0 with Debian Policy Standard version 4.4.0,
and now defaults to /usr/libexec for libexecdir as well. This is
present in Ubuntu 20.04 LTS, for example.

Signed-off-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/debian/ceph-base.install b/debian/ceph-base.install
index 24731dc89db10c5537610c1992cbf26f7fa01d3b..8ee22ebe5bf9a5dfe754ea26dd13a84c55368fde 100644 (file)
--- a/debian/ceph-base.install
+++ b/debian/ceph-base.install
@@ -7,7 +7,7 @@ usr/bin/crushtool
 usr/bin/monmaptool
 usr/bin/osdmaptool
 usr/bin/ceph-kvstore-tool
-usr/lib/ceph/ceph_common.sh
+usr/libexec/ceph/ceph_common.sh
 usr/lib/ceph/erasure-code/*
 usr/lib/rados-classes/*
 usr/sbin/ceph-create-keys

diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install
index 9b49ff9f9d54adfdf75d639a53aa6e47ad5a5002..509db19680a28b89e8973783f5758965d551416c 100755 (executable)
--- a/debian/ceph-osd.install
+++ b/debian/ceph-osd.install
@@ -9,7 +9,7 @@ usr/bin/ceph-objectstore-tool
 usr/bin/ceph-osdomap-tool
 usr/bin/${CEPH_OSD_BASENAME} => /usr/bin/ceph-osd
 usr/bin/ceph_objectstore_bench
-usr/lib/ceph/ceph-osd-prestart.sh
+usr/libexec/ceph/ceph-osd-prestart.sh
 usr/lib/libos_tp.so*
 usr/lib/libosd_tp.so*
 usr/sbin/ceph-volume

diff --git a/debian/control b/debian/control
index 9abc2bd752dd076c74b1de08d5b50f7c8ac40117..56882dee5505e75b5324986d37e82f24cea34dcc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,7 @@ Build-Depends: cmake (>= 3.5),
 # Make-Check   xmlstarlet,
                yasm [amd64],
                zlib1g-dev,
-Standards-Version: 3.9.3
+Standards-Version: 4.4.0
 
 Package: ceph
 Architecture: linux-any

diff --git a/debian/rules b/debian/rules
index de9d22afae23870ca2dc3a9be11995a760f3f284..e89432a9dc822a6d91277b41b2a709e7d63de12f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ extraopts += -DWITH_SYSTEMD=ON -DCEPH_SYSTEMD_ENV_DIR=/etc/default
 extraopts += -DWITH_GRAFANA=ON
 # assumes that ceph is exmpt from multiarch support, so we override the libdir.
 extraopts += -DCMAKE_INSTALL_LIBDIR=/usr/lib
-extraopts += -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib
+extraopts += -DCMAKE_INSTALL_LIBEXECDIR=/usr/libexec
 extraopts += -DCMAKE_INSTALL_SYSCONFDIR=/etc
 extraopts += -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=/lib/systemd/system
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))