deb: use variable expansion to support systemd unit dir changes

Ubuntu changed the systemd unit directory location between releases:
- Jammy (22.04): /lib/systemd/system
- Noble (24.04): /usr/lib/systemd/system

To maintain compatibility across both versions, update .install files
to use brace expansion pattern {usr/,}lib/systemd/system/<service>.

This pattern works because dh_install uses bsd_glob() with GLOB_CSH
flags, which expands braces and matches files in both locations
depending on where CMakeLists.txt actually installed them.

Fixes installation issues when building packages on Noble while
maintaining backward compatibility with Jammy builds.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 04324fa1ac1916b7a3db7928b26d4660c099d35c)

diff --git a/debian/ceph-base.install b/debian/ceph-base.install
index a3d7757a585e1532db1d8011c65fe297a1479b2e..140551187bad4257f3c24b2280508d3cd7e4a648 100644 (file)
--- a/debian/ceph-base.install
+++ b/debian/ceph-base.install
@@ -1,5 +1,5 @@
 etc/init.d/ceph
-lib/systemd/system/ceph-crash.service
+{usr/,}lib/systemd/system/ceph-crash.service
 usr/bin/ceph-crash
 usr/bin/ceph-debugpack
 usr/bin/ceph-run

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index fc4da0a179c80fac113ab8c7cb21a8b80419fbab..d6e3db774568d5d8db2e6b31319fef6e03eb4f64 100755 (executable)
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -4,8 +4,8 @@ etc/bash_completion.d/ceph
 etc/bash_completion.d/rados
 etc/bash_completion.d/radosgw-admin
 etc/bash_completion.d/rbd
-lib/systemd/system/ceph.target
-lib/systemd/system/rbdmap.service
+{usr/,}lib/systemd/system/ceph.target
+{usr/,}lib/systemd/system/rbdmap.service
 usr/bin/ceph
 usr/bin/ceph-authtool
 usr/bin/ceph-conf

diff --git a/debian/ceph-exporter.install b/debian/ceph-exporter.install
index 1ac0edcd2a18c5e43c47aa0f7afcf46d24b52cce..ed6440cd92b94c60d525eb5c737b078bd80be565 100644 (file)
--- a/debian/ceph-exporter.install
+++ b/debian/ceph-exporter.install
@@ -1,2 +1,2 @@
-lib/systemd/system/ceph-exporter*
+{usr/,}lib/systemd/system/ceph-exporter*
 usr/bin/ceph-exporter

diff --git a/debian/ceph-fuse.install b/debian/ceph-fuse.install
index 565ef25dda4c60fd530d5bba9dc9c3f7f58a3f12..6372957542b77c810d1b57a7e367ad246c3e9171 100644 (file)
--- a/debian/ceph-fuse.install
+++ b/debian/ceph-fuse.install
@@ -1,4 +1,4 @@
-lib/systemd/system/ceph-fuse*
+{usr/,}lib/systemd/system/ceph-fuse*
 usr/bin/ceph-fuse
 usr/sbin/mount.fuse.ceph sbin
 usr/share/man/man8/ceph-fuse.8

diff --git a/debian/ceph-immutable-object-cache.install b/debian/ceph-immutable-object-cache.install
index 76daf1928c3ac258c4d81718eb994f2f4511a762..f182e453fba5ae6462fe9dbcc8563bb8f681cfe4 100644 (file)
--- a/debian/ceph-immutable-object-cache.install
+++ b/debian/ceph-immutable-object-cache.install
@@ -1,3 +1,3 @@
-lib/systemd/system/ceph-immutable-object-cache*
+{usr/,}lib/systemd/system/ceph-immutable-object-cache*
 usr/bin/ceph-immutable-object-cache
 usr/share/man/man8/ceph-immutable-object-cache.8

diff --git a/debian/ceph-mds.install b/debian/ceph-mds.install
index a26d5596c59a0c117bba2ad4697ede487c8507d0..b9b1bc41106b4b6d937a519c84211a6275d58401 100644 (file)
--- a/debian/ceph-mds.install
+++ b/debian/ceph-mds.install
@@ -1,3 +1,3 @@
-lib/systemd/system/ceph-mds*
+{usr/,}lib/systemd/system/ceph-mds*
 usr/bin/ceph-mds
 usr/share/man/man8/ceph-mds.8

diff --git a/debian/ceph-mgr.install b/debian/ceph-mgr.install
index 9535b1e60bca8e6d8e0b805034a5bc8feb060912..11a4a9ce4e2adf6aaf69ba8dcf1191736f2791bc 100644 (file)
--- a/debian/ceph-mgr.install
+++ b/debian/ceph-mgr.install
@@ -1,4 +1,4 @@
-lib/systemd/system/ceph-mgr*
+{usr/,}lib/systemd/system/ceph-mgr*
 usr/bin/ceph-mgr
 usr/share/ceph/mgr/mgr_module.*
 usr/share/ceph/mgr/mgr_util.*

diff --git a/debian/ceph-mon.install b/debian/ceph-mon.install
index ff429f17a6af4fefbc5d716c946890ce39812295..cdba732e1c3421ffb394bde75de620e980b989a8 100644 (file)
--- a/debian/ceph-mon.install
+++ b/debian/ceph-mon.install
@@ -1,4 +1,4 @@
-lib/systemd/system/ceph-mon*
+{usr/,}lib/systemd/system/ceph-mon*
 usr/bin/ceph-mon
 usr/bin/ceph-monstore-tool
 usr/share/man/man8/ceph-mon.8

diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install
index 7e6f62e34f662ac0f95423f19e07c871032fed76..217c9bea719db6b8d80f26c3ea801d41d2767a08 100755 (executable)
--- a/debian/ceph-osd.install
+++ b/debian/ceph-osd.install
@@ -1,6 +1,6 @@
 #! /usr/bin/dh-exec
 
-lib/systemd/system/ceph-osd*
+{usr/,}lib/systemd/system/ceph-osd*
 usr/bin/ceph-bluestore-tool
 usr/bin/ceph-clsinfo
 usr/bin/ceph-erasure-code-tool

diff --git a/debian/ceph-volume.install b/debian/ceph-volume.install
index b43f08ae828141549aee8b6a4d91aa61ca2985c0..9f02cdde9ac69832d0fdd6c6bf83ebae4c3f6546 100644 (file)
--- a/debian/ceph-volume.install
+++ b/debian/ceph-volume.install
@@ -1,4 +1,4 @@
-lib/systemd/system/ceph-volume@.service
+{usr/,}lib/systemd/system/ceph-volume@.service
 usr/lib/python*/dist-packages/ceph_volume/*
 usr/lib/python*/dist-packages/ceph_volume-*
 usr/sbin/ceph-volume

diff --git a/debian/cephfs-mirror.install b/debian/cephfs-mirror.install
index ca0807e27c02dce88baa095cbcea5151a2696f66..ad54d6e898dbfdb0d9e9e74c2d6a715e6b9dd16b 100644 (file)
--- a/debian/cephfs-mirror.install
+++ b/debian/cephfs-mirror.install
@@ -1,3 +1,3 @@
-lib/systemd/system/cephfs-mirror*
+{usr/,}lib/systemd/system/cephfs-mirror*
 usr/bin/cephfs-mirror
 usr/share/man/man8/cephfs-mirror.8

diff --git a/debian/radosgw.install b/debian/radosgw.install
index be74a52c1a9c296c439bc38233f7b283235c1b36..074f769a181f11f8221961d1818ee8d032c768d1 100644 (file)
--- a/debian/radosgw.install
+++ b/debian/radosgw.install
@@ -1,4 +1,4 @@
-lib/systemd/system/ceph-radosgw*
+{usr/,}lib/systemd/system/ceph-radosgw*
 usr/bin/ceph-diff-sorted
 usr/bin/radosgw
 usr/bin/radosgw-es

diff --git a/debian/rbd-mirror.install b/debian/rbd-mirror.install
index cc617a553047ecb1f13ef96dbca4e955a4a6aeaf..7ddfdcb716158b25b17fa1237541fa60f7e159b7 100644 (file)
--- a/debian/rbd-mirror.install
+++ b/debian/rbd-mirror.install
@@ -1,3 +1,3 @@
-lib/systemd/system/ceph-rbd-mirror*
+{usr/,}lib/systemd/system/ceph-rbd-mirror*
 usr/bin/rbd-mirror
 usr/share/man/man8/rbd-mirror.8