Browse Source

Rework patch for detection of systemd-reply-password. Closes: #993246

Christoph Biedl 11 months ago
parent
commit
87d3b8047a
1 changed files with 13 additions and 7 deletions
  1. 13 7
      debian/patches/debian/2021-02-10.build-on-non-usrmerge.patch

+ 13 - 7
debian/patches/debian/2021-02-10.build-on-non-usrmerge.patch

@@ -1,20 +1,26 @@
 Subject: Adjust build for non-usrmerged systems
 Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Date: 2020-12-29
+Bug-Debian: https://bugs.debian.org/993246
 Forwarded: not-needed
-Last-Update: 2021-02-10
+Last-Update: 2021-08-30
 
     Was previously part of
     cherry-pick/1606953228.v15-5-g9cdd041.systemd-drop-ncat-dependency.patch
 
+    The legacy path /lib should be the first in the list, else package
+    package will not build reproducibly between usrmerged/unmerged build
+    environments.
+
+    This patch can be removed once unmerged /usr is no longer supported.
+
 --- a/src/luks/systemd/meson.build
 +++ b/src/luks/systemd/meson.build
-@@ -4,7 +4,7 @@
+@@ -1,6 +1,7 @@
+ systemd = dependency('systemd', required: false)
+ 
+ sd_reply_pass = find_program(
++  join_paths('/', 'lib', 'systemd', 'systemd-reply-password'),
    join_paths(get_option('prefix'), get_option('libdir'), 'systemd', 'systemd-reply-password'),
    join_paths(get_option('prefix'), 'lib', 'systemd', 'systemd-reply-password'),
    join_paths('/', 'usr', get_option('libdir'), 'systemd', 'systemd-reply-password'),
--  join_paths('/', 'usr', 'lib', 'systemd', 'systemd-reply-password'),
-+  join_paths('/', 'lib', 'systemd', 'systemd-reply-password'),
-   required: false
- )
-