[Debian-ha-maintainers] Bug#1052705: pacemaker FTBFS when systemd.pc changes systemdsystemunitdir

Helmut Grohne helmut at subdivi.de
Tue Sep 26 10:10:32 BST 2023


Source: pacemaker
Version: 2.1.6-1
Tags: ftbfs patch
User: helmutg at debian.org
Usertags: dep17m2

We want to change the value of systemdsystemunitdir in systemd.pc to
point below /usr. pacemaker's upstream build system consumes thie
variable while the packaging hard codes its current value. As we change
it, pacemaker will FTBFS. Consider applying the attached patch to avoid
this failure.

Helmut
-------------- next part --------------
diff -Nru pacemaker-2.1.6/debian/changelog pacemaker-2.1.6/debian/changelog
--- pacemaker-2.1.6/debian/changelog	2023-07-05 12:38:47.000000000 +0200
+++ pacemaker-2.1.6/debian/changelog	2023-09-26 10:25:11.000000000 +0200
@@ -1,3 +1,10 @@
+pacemaker (2.1.6-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 26 Sep 2023 10:25:11 +0200
+
 pacemaker (2.1.6-1) unstable; urgency=medium
 
   * [bea63bb] New upstream release (2.1.6) (Closes: #1040165)
diff -Nru pacemaker-2.1.6/debian/pacemaker-cli-utils.install pacemaker-2.1.6/debian/pacemaker-cli-utils.install
--- pacemaker-2.1.6/debian/pacemaker-cli-utils.install	2023-01-22 13:10:39.000000000 +0100
+++ pacemaker-2.1.6/debian/pacemaker-cli-utils.install	2023-09-26 10:25:11.000000000 +0200
@@ -1,7 +1,7 @@
 #!/usr/bin/dh-exec
 
 etc/default/crm_mon
-lib/systemd/system/crm_mon.service usr/share/doc/pacemaker-cli-utils/examples [linux-any]
+${deb_systemdsystemunitdir}/crm_mon.service usr/share/doc/pacemaker-cli-utils/examples [linux-any]
 usr/sbin/attrd_updater
 usr/sbin/cibadmin
 usr/sbin/cibsecret
diff -Nru pacemaker-2.1.6/debian/pacemaker-remote.install pacemaker-2.1.6/debian/pacemaker-remote.install
--- pacemaker-2.1.6/debian/pacemaker-remote.install	2023-01-22 13:10:39.000000000 +0100
+++ pacemaker-2.1.6/debian/pacemaker-remote.install	2023-09-26 10:25:11.000000000 +0200
@@ -1,7 +1,7 @@
 #!/usr/bin/dh-exec
 
 daemons/execd/pacemaker_remote etc/init.d
-lib/systemd/system/pacemaker_remote.service [linux-any]
+${deb_systemdsystemunitdir}/pacemaker_remote.service [linux-any]
 usr/sbin/pacemaker_remoted
 usr/sbin/pacemaker-remoted
 usr/share/man/man8/pacemaker-remoted.8
diff -Nru pacemaker-2.1.6/debian/pacemaker.install pacemaker-2.1.6/debian/pacemaker.install
--- pacemaker-2.1.6/debian/pacemaker.install	2023-01-22 13:10:39.000000000 +0100
+++ pacemaker-2.1.6/debian/pacemaker.install	2023-09-26 10:25:11.000000000 +0200
@@ -1,7 +1,7 @@
 #!/usr/bin/dh-exec
 
 etc/init.d/pacemaker
-lib/systemd/system/pacemaker.service [linux-any]
+${deb_systemdsystemunitdir}/pacemaker.service [linux-any]
 usr/lib/pacemaker
 usr/lib/ocf/resource.d/pacemaker/controld
 usr/lib/ocf/resource.d/pacemaker/o2cb
diff -Nru pacemaker-2.1.6/debian/rules pacemaker-2.1.6/debian/rules
--- pacemaker-2.1.6/debian/rules	2023-01-22 13:10:39.000000000 +0100
+++ pacemaker-2.1.6/debian/rules	2023-09-26 10:25:11.000000000 +0200
@@ -6,6 +6,8 @@
 # Link against all needed libraries (cf. Policy 10.2)
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
 
+export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
+
 # Ubuntu/i386 shrank into a compatibility layer not carrying the
 # dependencies of some of our binary packages (#948379):
 ifeq ($(shell dpkg-vendor --query vendor)/$(DEB_HOST_ARCH), Ubuntu/i386)


More information about the Debian-ha-maintainers mailing list