Source: lvm2
Version: 2.03.16-2
Severity: normal
Tags: ftbfs patch
User: helm...@debian.org
Usertags: dep17m2
We want to change the value of systemdsystemunitdir in systemd.pc to
point below /usr. lvm2's upstream build system consumes this variable,
but its packaging hard codes the current value. Consequently, lvm2 FTBFS
when it is changed. Consider applying the attached patch to avoid that
failure.
Helmut
diff -Nru lvm2-2.03.16/debian/changelog lvm2-2.03.16/debian/changelog
--- lvm2-2.03.16/debian/changelog 2022-10-19 21:37:31.000000000 +0200
+++ lvm2-2.03.16/debian/changelog 2023-09-25 22:02:41.000000000 +0200
@@ -1,3 +1,11 @@
+lvm2 (2.03.16-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS when systemd.pc changes systemdsystemunitdir or when udev.pc
+ changes udevdir. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 25 Sep 2023 22:02:41 +0200
+
lvm2 (2.03.16-2) unstable; urgency=medium
* Remove remaining unused init scripts.
diff -Nru lvm2-2.03.16/debian/dmeventd.install
lvm2-2.03.16/debian/dmeventd.install
--- lvm2-2.03.16/debian/dmeventd.install 2022-10-19 21:37:31.000000000
+0200
+++ lvm2-2.03.16/debian/dmeventd.install 2023-09-25 22:02:41.000000000
+0200
@@ -1,5 +1,5 @@
lib/*/libdevmapper-event-*
lib/*/device-mapper/libdevmapper-event-*
-lib/systemd/system/dm-event*
+${env:systemdsystemunitdir}/dm-event*
sbin/dmeventd
usr/share/man/man8/dmeventd.8
diff -Nru lvm2-2.03.16/debian/dmsetup.install
lvm2-2.03.16/debian/dmsetup.install
--- lvm2-2.03.16/debian/dmsetup.install 2022-10-19 21:37:31.000000000 +0200
+++ lvm2-2.03.16/debian/dmsetup.install 2023-09-25 22:02:41.000000000 +0200
@@ -1,5 +1,5 @@
../../initramfs-tools/dmsetup/* usr/share/initramfs-tools
-lib/udev/rules.d/*-dm*.rules
+${env:udevdir}/rules.d/*-dm*.rules
sbin/blkdeactivate
sbin/dmsetup
sbin/dmstats
diff -Nru lvm2-2.03.16/debian/lvm2-dbusd.install
lvm2-2.03.16/debian/lvm2-dbusd.install
--- lvm2-2.03.16/debian/lvm2-dbusd.install 2022-10-19 21:37:31.000000000
+0200
+++ lvm2-2.03.16/debian/lvm2-dbusd.install 2023-09-25 22:02:41.000000000
+0200
@@ -1,5 +1,5 @@
etc/dbus-1/system.d/com.redhat.lvmdbus1.conf
-lib/systemd/system/lvm2-lvmdbusd.service
+${env:systemdsystemunitdir}/lvm2-lvmdbusd.service
sbin/lvmdbusd
usr/lib/python*/*-packages/lvmdbusd/
usr/share/dbus-1/system-services/com.redhat.lvmdbus1.service
diff -Nru lvm2-2.03.16/debian/lvm2-lockd.install
lvm2-2.03.16/debian/lvm2-lockd.install
--- lvm2-2.03.16/debian/lvm2-lockd.install 2022-10-19 21:37:31.000000000
+0200
+++ lvm2-2.03.16/debian/lvm2-lockd.install 2023-09-25 22:02:41.000000000
+0200
@@ -1,5 +1,5 @@
-lib/systemd/system/lvmlockd.service
-lib/systemd/system/lvmlocks.service
+${env:systemdsystemunitdir}/lvmlockd.service
+${env:systemdsystemunitdir}/lvmlocks.service
sbin/lvmlockctl
sbin/lvmlockd
usr/share/man/man8/lvmlockctl.8
diff -Nru lvm2-2.03.16/debian/lvm2.install lvm2-2.03.16/debian/lvm2.install
--- lvm2-2.03.16/debian/lvm2.install 2022-10-19 21:37:31.000000000 +0200
+++ lvm2-2.03.16/debian/lvm2.install 2023-09-25 22:02:41.000000000 +0200
@@ -1,9 +1,9 @@
../../initramfs-tools/lvm2/* usr/share/initramfs-tools
etc/lvm
-lib/systemd/system/blk-availability*
-lib/systemd/system/lvm2-lvmpolld*
-lib/systemd/system/lvm2-monitor*
-lib/udev/rules.d/*-lvm*.rules
+${env:systemdsystemunitdir}/blk-availability*
+${env:systemdsystemunitdir}/lvm2-lvmpolld*
+${env:systemdsystemunitdir}/lvm2-monitor*
+${env:udevdir}/rules.d/*-lvm*.rules
sbin/fsadm
sbin/lvchange
sbin/lvconvert
diff -Nru lvm2-2.03.16/debian/rules lvm2-2.03.16/debian/rules
--- lvm2-2.03.16/debian/rules 2022-10-19 21:37:31.000000000 +0200
+++ lvm2-2.03.16/debian/rules 2023-09-25 22:02:41.000000000 +0200
@@ -16,6 +16,9 @@
DEVMAPPER_VERSION_DEBIAN = $(DEVMAPPER_VERSION)-$(VERSION_DEBIAN)
DEVMAPPER_VERSION_FILE = $(DEVMAPPER_VERSION_PLAIN)-$(VERSION_DEBIAN)
+export systemdsystemunitdir = $(shell pkg-config
--variable=systemdsystemunitdir systemd | sed s,^/,,)
+export udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
GENCONTROL_ARGS = -Vdevmapper:Version=$(DEVMAPPER_VERSION_DEBIAN)
ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
