From: Neal Gompa <ngompa13@gmail.com>
Date: Mon, 8 Jun 2020 16:59:47 +0000 (-0400)
Subject: debian: Use /usr/libexec for libexecdir
X-Git-Tag: v16.1.0~2091^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79d4bf5b2f0861cc99e00d42618b4ea813eebc99;p=ceph.git

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 24731dc89db1..8ee22ebe5bf9 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 9b49ff9f9d54..509db19680a2 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 9abc2bd752dd..56882dee5505 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 de9d22afae23..e89432a9dc82 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)))