- release 6 (by relup.sh)

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

diff --git a/udevadm-in-sbin.patch b/udevadm-in-sbin.patch
index e0d5d29f0bb1994f818c2b1b2594b82c2423e5a8..d97fd539da4097d3285b7c81b0d70700151e21fa 100644 (file)
--- a/udevadm-in-sbin.patch
+++ b/udevadm-in-sbin.patch
@@ -1,26 +1,51 @@
---- systemd-183/Makefile.am~   2012-05-30 14:28:53.647009365 +0200
-+++ systemd-183/Makefile.am    2012-05-30 14:35:41.593661644 +0200
-@@ -2965,6 +2965,7 @@
-       $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
-               -e 's,@rootbindir\@,$(rootbindir),g' \
-               -e 's,@bindir\@,$(bindir),g' \
-+              -e 's,@sbindir\@,$(sbindir),g' \
-               -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
-               -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
-               -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+--- 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',
+ substs.set('pkgsysconfdir',                                   pkgsysconfdir)
+ substs.set('bindir',                                          bindir)
+ substs.set('rootbindir',                                      rootbindir)
++substs.set('rootsbindir',                                     rootsbindir)
+ substs.set('rootlibexecdir',                                  rootlibexecdir)
+ substs.set('systemunitdir',                                   systemunitdir)
+ substs.set('userunitdir',                                     userunitdir)
+@@ -2164,7 +2166,7 @@ exe = executable('udevadm',
+                                  libblkid],
+                  install_rpath : udev_rpath,
+                  install : true,
+-                 install_dir : rootbindir)
++                 install_dir : rootsbindir)
+ 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 @@
  [Service]
  Type=oneshot
  RemainAfterExit=yes
--ExecStart=@bindir@/udevadm trigger --type=subsystems --action=add ; @bindir@/udevadm trigger --type=devices --action=add
-+ExecStart=@sbindir@/udevadm trigger --type=subsystems --action=add ; @sbindir@/udevadm trigger --type=devices --action=add
+-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
 --- 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 @@
  Type=oneshot
  TimeoutSec=180
  RemainAfterExit=yes
--ExecStart=@bindir@/udevadm settle
-+ExecStart=@sbindir@/udevadm settle
+-ExecStart=@rootbindir@/udevadm settle
++ExecStart=@rootsbindir@/udevadm settle
+--- systemd-199/units/initrd-udevadm-cleanup-db.service.in~    2013-03-11 18:01:33.616138706 +0100
++++ systemd-199/units/initrd-udevadm-cleanup-db.service.in     2013-03-26 19:09:54.525625477 +0100
+@@ -15,4 +15,4 @@
+ 
+ [Service]
+ Type=oneshot
+-ExecStart=-@rootbindir@/udevadm info --cleanup-db
++ExecStart=-@rootsbindir@/udevadm info --cleanup-db