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

Helmut Grohne helmut at subdivi.de
Tue Sep 26 09:47:09 BST 2023


Source: pcs
Version: 0.11.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. pcs' upstream build system consumes this variable
while the packaging hard codes its current value. As we change it, pcs
will FTBFS. Consider applying the attached patch to avoid this failure.

Helmut
-------------- next part --------------
diff -Nru pcs-0.11.6/debian/changelog pcs-0.11.6/debian/changelog
--- pcs-0.11.6/debian/changelog	2023-06-23 23:49:17.000000000 +0200
+++ pcs-0.11.6/debian/changelog	2023-09-26 10:25:57.000000000 +0200
@@ -1,3 +1,10 @@
+pcs (0.11.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:57 +0200
+
 pcs (0.11.6-1) unstable; urgency=medium
 
   * New upstream version 0.11.6 (Closes: #1038797)
diff -Nru pcs-0.11.6/debian/control pcs-0.11.6/debian/control
--- pcs-0.11.6/debian/control	2023-06-23 23:49:17.000000000 +0200
+++ pcs-0.11.6/debian/control	2023-09-26 10:25:57.000000000 +0200
@@ -35,6 +35,7 @@
  ruby-rubygems,
  ruby-sinatra,
  systemd,
+ systemd-dev,
  wget,
 Rules-Requires-Root: no
 Standards-Version: 4.6.2
diff -Nru pcs-0.11.6/debian/pcs-snmp.install pcs-0.11.6/debian/pcs-snmp.install
--- pcs-0.11.6/debian/pcs-snmp.install	2022-10-09 06:06:48.000000000 +0200
+++ pcs-0.11.6/debian/pcs-snmp.install	2023-09-26 10:25:57.000000000 +0200
@@ -1,5 +1,5 @@
 etc/default/pcs_snmp_agent
-lib/systemd/system/pcs_snmp_agent.service
+${env:systemdsystemunitdir}/pcs_snmp_agent.service
 usr/lib/python3/dist-packages/pcs/snmp/*
 usr/share/man/man8/pcs_snmp_agent.8
 usr/share/pcs/pcs_snmp_agent
diff -Nru pcs-0.11.6/debian/pcs.install pcs-0.11.6/debian/pcs.install
--- pcs-0.11.6/debian/pcs.install	2022-10-09 06:06:48.000000000 +0200
+++ pcs-0.11.6/debian/pcs.install	2023-09-26 10:25:57.000000000 +0200
@@ -1,8 +1,8 @@
 etc/default/pcsd
 etc/logrotate.d/pcsd
 etc/pam.d/pcsd
-lib/systemd/system/pcsd-ruby.service
-lib/systemd/system/pcsd.service
+${env:systemdsystemunitdir}/pcsd-ruby.service
+${env:systemdsystemunitdir}/pcsd.service
 usr/lib/python*/*-packages/pcs-*.egg-info
 usr/lib/python*/*-packages/pcs/*
 usr/sbin/pcs
diff -Nru pcs-0.11.6/debian/rules pcs-0.11.6/debian/rules
--- pcs-0.11.6/debian/rules	2022-10-09 06:06:48.000000000 +0200
+++ pcs-0.11.6/debian/rules	2023-09-26 10:25:57.000000000 +0200
@@ -3,6 +3,8 @@
 # output every command that modifies files on the build system.
 #DH_VERBOSE = 1
 
+export systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
+
 # main packaging script based on dh7 syntax
 %:
 	dh $@ --with python3


More information about the Debian-ha-maintainers mailing list