Source: clevis
Version: 19-3
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. clevis' upstream build system consumes this value, but
the debian packaging hard codes its current value. When it changes,
clevis will fail to build from source. Consider applying the attached
patch to avoid that.

Helmut
diff -Nru clevis-19/debian/changelog clevis-19/debian/changelog
--- clevis-19/debian/changelog  2023-07-23 12:04:17.000000000 +0200
+++ clevis-19/debian/changelog  2023-09-25 13:52:04.000000000 +0200
@@ -1,3 +1,10 @@
+clevis (19-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Do not FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Mon, 25 Sep 2023 13:52:04 +0200
+
 clevis (19-3) unstable; urgency=medium
 
   * Retire versioned dependencies met even in oldstable
diff -Nru clevis-19/debian/clevis-systemd.install 
clevis-19/debian/clevis-systemd.install
--- clevis-19/debian/clevis-systemd.install     2023-01-28 11:43:54.000000000 
+0100
+++ clevis-19/debian/clevis-systemd.install     2023-09-25 13:51:26.000000000 
+0200
@@ -1,5 +1,5 @@
 
-lib/systemd/system/clevis-luks-askpass.path
-lib/systemd/system/clevis-luks-askpass.service
+${env:systemdsystemunitdir}/clevis-luks-askpass.path
+${env:systemdsystemunitdir}/clevis-luks-askpass.service
 
 usr/libexec/clevis-luks-askpass
diff -Nru clevis-19/debian/control clevis-19/debian/control
--- clevis-19/debian/control    2023-07-23 11:53:08.000000000 +0200
+++ clevis-19/debian/control    2023-09-25 13:51:46.000000000 +0200
@@ -22,6 +22,7 @@
     libssl-dev,
     libudisks2-dev,
     meson,
+    pkgconf,
     systemd,
     tang,
     tpm2-tools,
diff -Nru clevis-19/debian/rules clevis-19/debian/rules
--- clevis-19/debian/rules      2023-01-28 11:43:54.000000000 +0100
+++ clevis-19/debian/rules      2023-09-25 13:52:03.000000000 +0200
@@ -4,6 +4,8 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
+export systemdsystemunitdir = $(shell pkgconf --variable=systemdsystemunitdir 
systemd | sed s,^/,,)
+
 %:
        dh $@ --with=bash-completion
 

Reply via email to