- rel 2; provide system-environment-generator dir

[packages/systemd.git] / udevadm-in-sbin.patch

diff --git a/udevadm-in-sbin.patch b/udevadm-in-sbin.patch
index d97fd539da4097d3285b7c81b0d70700151e21fa..db0ac12e7d3d6f707818a5dab7806f03a2599e17 100644 (file)
--- a/udevadm-in-sbin.patch
+++ b/udevadm-in-sbin.patch
@@ -1,14 +1,6 @@
---- systemd-235/meson.build~   2017-10-06 10:18:04.000000000 +0200
-+++ systemd-235/meson.build    2017-10-21 15:12:47.202404998 +0200
-@@ -67,6 +67,7 @@ datadir = join_paths(prefixdir, get_opti
- localstatedir = join_paths('/', get_option('localstatedir'))
- 
- rootbindir = join_paths(rootprefixdir, 'bin')
-+rootsbindir = join_paths(rootprefixdir, 'sbin')
- rootlibexecdir = join_paths(rootprefixdir, 'lib/systemd')
- 
- rootlibdir = get_option('rootlibdir')
-@@ -200,6 +201,7 @@ substs.set('includedir',
+--- systemd-240/meson.build.orig       2018-12-21 19:53:33.000000000 +0100
++++ systemd-240/meson.build    2019-01-13 10:00:36.555639211 +0100
+@@ -243,6 +243,7 @@
  substs.set('pkgsysconfdir',                                   pkgsysconfdir)
  substs.set('bindir',                                          bindir)
  substs.set('rootbindir',                                      rootbindir)
@@ -16,23 +8,25 @@
  substs.set('rootlibexecdir',                                  rootlibexecdir)
  substs.set('systemunitdir',                                   systemunitdir)
  substs.set('userunitdir',                                     userunitdir)
-@@ -2164,7 +2166,7 @@ exe = executable('udevadm',
+@@ -2667,7 +2668,7 @@
                                   libblkid],
                   install_rpath : udev_rpath,
                   install : true,
 -                 install_dir : rootbindir)
 +                 install_dir : rootsbindir)
- public_programs += [exe]
+ public_programs += exe
  
  executable('systemd-shutdown',
 --- systemd-183/units/systemd-udev-trigger.service.in~ 2012-05-21 15:14:51.642981269 +0200
 +++ systemd-183/units/systemd-udev-trigger.service.in  2012-05-30 13:55:20.229509590 +0200
-@@ -17,4 +17,4 @@
+@@ -17,5 +17,5 @@
  [Service]
  Type=oneshot
  RemainAfterExit=yes
--ExecStart=@rootbindir@/udevadm trigger --type=subsystems --action=add ; @rootbindir@/udevadm trigger --type=devices --action=add
-+ExecStart=@rootsbindir@/udevadm trigger --type=subsystems --action=add ; @rootsbindir@/udevadm trigger --type=devices --action=add
+-ExecStart=@rootbindir@/udevadm trigger --type=subsystems --action=add
+-ExecStart=@rootbindir@/udevadm trigger --type=devices --action=add
++ExecStart=@rootsbindir@/udevadm trigger --type=subsystems --action=add
++ExecStart=@rootsbindir@/udevadm trigger --type=devices --action=add
 --- systemd-183/units/systemd-udev-settle.service.in~  2012-05-30 13:43:34.886201138 +0200
 +++ systemd-183/units/systemd-udev-settle.service.in   2012-05-30 13:55:44.546175399 +0200
 @@ -29,4 +29,4 @@