From 79d4bf5b2f0861cc99e00d42618b4ea813eebc99 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 8 Jun 2020 12:59:47 -0400 Subject: [PATCH] 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 --- debian/ceph-base.install | 2 +- debian/ceph-osd.install | 2 +- debian/control | 2 +- debian/rules | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/ceph-base.install b/debian/ceph-base.install index 24731dc89db..8ee22ebe5bf 100644 --- 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 9b49ff9f9d5..509db19680a 100755 --- 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 9abc2bd752d..56882dee550 100644 --- 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 de9d22afae2..e89432a9dc8 100755 --- 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))) -- 2.39.5