Browse Source

Fix build on non-usrmerged chroots

Christoph Biedl 1 year ago
parent
commit
8203c17754

+ 7 - 2
debian/patches/cherry-pick.v15-5-g9cdd041.systemd-drop-ncat-dependency.patch

@@ -15,6 +15,10 @@ Date: Wed Dec 2 20:53:48 2020 -0300
 
     [1] https://systemd.io/PASSWORD_AGENTS/
 
+    --
+
+    Extra adjustment needed to build on pre-usrmerge chroots.
+
 --- a/INSTALL.md
 +++ b/INSTALL.md
 @@ -22,7 +22,6 @@
@@ -205,7 +209,7 @@ Date: Wed Dec 2 20:53:48 2020 -0300
  }
 --- a/src/luks/systemd/meson.build
 +++ b/src/luks/systemd/meson.build
-@@ -1,6 +1,15 @@
+@@ -1,6 +1,16 @@
  systemd = dependency('systemd', required: false)
  
 -if systemd.found()
@@ -214,6 +218,7 @@ Date: Wed Dec 2 20:53:48 2020 -0300
 +  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
 +)
 +
@@ -222,7 +227,7 @@ Date: Wed Dec 2 20:53:48 2020 -0300
    subdir('dracut')
  
    unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
-@@ -12,8 +21,14 @@
+@@ -12,8 +22,14 @@
      configuration: data,
    )