--- systemd-235/units/meson.build.org 2017-10-21 15:20:03.280741248 +0200
+++ systemd-235/units/meson.build 2017-10-21 15:20:23.741288778 +0200
-@@ -68,8 +68,9 @@ units = [
- ['swap.target', ''],
- ['sys-fs-fuse-connections.mount', '',
+@@ -76,6 +76,7 @@ units = [
'sysinit.target.wants/'],
['sys-kernel-config.mount', '',
'sysinit.target.wants/'],
+ ['sys-kernel-config.service', ''],
['sys-kernel-debug.mount', '',
'sysinit.target.wants/'],
- ['sysinit.target', ''],
+ ['sys-kernel-tracing.mount', '',
diff -durN -x '*.orig' systemd-208.orig/units/sys-kernel-config.mount systemd-208/units/sys-kernel-config.mount
--- systemd-208.orig/units/sys-kernel-config.mount 2013-08-13 22:02:52.000000000 +0200
+++ systemd-208/units/sys-kernel-config.mount 2014-01-10 10:22:04.000000000 +0100
Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa
Name: systemd
# Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version: 244
-Release: 2
+Version: 245
+Release: 0.1
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
#Source0Download: https://github.com/systemd/systemd/releases
Source0: https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 413121fe918b252ae62310f6fc7c4b32
+# Source0-md5: 04f02d9841ea5992a16f6b03c873da28
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
Patch2: pld-sysv-network.patch
Patch3: tmpfiles-not-fatal.patch
Patch4: udev-ploop-rules.patch
-Patch5: udevadm-in-sbin.patch
+
Patch6: net-rename-revert.patch
Patch7: %{name}-completion.patch
Patch8: proc-hidepid.patch
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
+
# rejected upstream (do not disable!)
%patch6 -p1
%patch7 -p1
cp -p %{SOURCE2} src/systemd_booted.c
+grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash,#!/bin/bash,g'
+
%build
%meson build \
-Daudit=%{__true_false audit} \
-Ddefault-kill-user-processes=false \
%{?debug:--buildtype=debug} \
-Defi=%{__true_false efi} \
- -Dhalt-local=/sbin/halt.local \
-Dkexec-path=/sbin/kexec \
- -Dkill-path=/bin/kill \
-Dkmod-path=/sbin/kmod \
-Dlibcryptsetup=%{__true_false cryptsetup} \
-Dlibidn2=true \
-Drc-local=/etc/rc.d/rc.local \
-Drootlibdir=/%{_lib} \
-Drootprefix="" \
- -Drootsbindir=%{_rootsbindir} \
-Dselinux=%{__true_false selinux} \
-Dsetfont-path=/bin/setfont \
-Dsplit-bin=true \
ln -s /lib/udev/udevd $RPM_BUILD_ROOT%{_rootsbindir}/udevd
# compat symlinks for "/ merged into /usr" programs
-ln -s %{_rootsbindir}/udevadm $RPM_BUILD_ROOT/bin
+ln -s ../bin/udevadm $RPM_BUILD_ROOT%{_rootsbindir}
ln -s /lib/udev $RPM_BUILD_ROOT%{_prefix}/lib
# install custom udev rules from pld package
%endif
%triggerpostun -n udev-core -- udev < 165
-/sbin/udevadm info --convert-db
+/bin/udevadm info --convert-db
%post -n udev-core
-/sbin/udevadm hwdb --update || :
+/bin/udevadm hwdb --update || :
if [ $1 -gt 1 ]; then
if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
if grep -qs devtmpfs /proc/mounts && [ -n "$(pidof udevd)" ]; then
- /sbin/udevadm control --exit
+ /bin/udevadm control --exit
/lib/udev/udevd --daemon
fi
else
%attr(755,root,root) %{_bindir}/systemd-sysv-convert
%attr(755,root,root) %{_bindir}/systemd-umount
%attr(755,root,root) %{_bindir}/timedatectl
+%attr(755,root,root) %{_bindir}/userdbctl
/lib/modprobe.d/systemd.conf
/lib/systemd/import-pubring.gpg
/lib/systemd/resolv.conf
%{_mandir}/man1/systemd-tty-ask-password-agent.1*
%{_mandir}/man1/systemd-umount.1*
%{_mandir}/man1/timedatectl.1*
+%{_mandir}/man1/userdbctl.1*
%{_mandir}/man5/binfmt.d.5*
%{_mandir}/man5/coredump.conf.5*
%{_mandir}/man5/coredump.conf.d.5*
/lib/udev/hwdb.d/20-usb-vendor-model.hwdb
/lib/udev/hwdb.d/20-vmbus-class.hwdb
/lib/udev/hwdb.d/60-evdev.hwdb
+/lib/udev/hwdb.d/60-input-id.hwdb
/lib/udev/hwdb.d/60-keyboard.hwdb
/lib/udev/hwdb.d/60-sensor.hwdb
/lib/udev/hwdb.d/70-joystick.hwdb
---- systemd-238/units/systemd-tmpfiles-setup.service.in~ 2018-03-05 23:16:37.000000000 +0100
-+++ systemd-238/units/systemd-tmpfiles-setup.service.in 2018-05-15 13:23:51.990328057 +0200
-@@ -19,5 +19,5 @@ RefuseManualStop=yes
+diff -ur systemd-245/units.org/systemd-tmpfiles-clean.service systemd-245/units/systemd-tmpfiles-clean.service
+--- systemd-245/units.org/systemd-tmpfiles-clean.service 2020-03-06 13:38:52.000000000 +0100
++++ systemd-245/units/systemd-tmpfiles-clean.service 2020-04-03 21:08:42.151365700 +0200
+@@ -17,6 +17,6 @@
+
+ [Service]
+ Type=oneshot
+-ExecStart=systemd-tmpfiles --clean
++ExecStart=-systemd-tmpfiles --clean
+ SuccessExitStatus=DATAERR
+ IOSchedulingClass=idle
+diff -ur systemd-245/units.org/systemd-tmpfiles-setup-dev.service systemd-245/units/systemd-tmpfiles-setup-dev.service
+--- systemd-245/units.org/systemd-tmpfiles-setup-dev.service 2020-03-06 13:38:52.000000000 +0100
++++ systemd-245/units/systemd-tmpfiles-setup-dev.service 2020-04-03 21:08:42.151365700 +0200
+@@ -18,5 +18,5 @@
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=systemd-tmpfiles --prefix=/dev --create --boot
++ExecStart=-systemd-tmpfiles --prefix=/dev --create --boot
+ SuccessExitStatus=DATAERR CANTCREAT
+diff -ur systemd-245/units.org/systemd-tmpfiles-setup.service systemd-245/units/systemd-tmpfiles-setup.service
+--- systemd-245/units.org/systemd-tmpfiles-setup.service 2020-03-06 13:38:52.000000000 +0100
++++ systemd-245/units/systemd-tmpfiles-setup.service 2020-04-03 21:08:42.151365700 +0200
+@@ -19,5 +19,5 @@
[Service]
Type=oneshot
RemainAfterExit=yes
--ExecStart=@rootbindir@/systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
-+ExecStart=-@rootbindir@/systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
+-ExecStart=systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
++ExecStart=-systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
SuccessExitStatus=DATAERR CANTCREAT
---- systemd-238/units/systemd-tmpfiles-clean.service.in~ 2018-03-05 23:16:37.000000000 +0100
-+++ systemd-238/units/systemd-tmpfiles-clean.service.in 2018-05-15 13:24:19.297825542 +0200
-@@ -17,6 +17,6 @@ Before=shutdown.target
+diff -ur systemd-245/units.org/user/systemd-tmpfiles-clean.service systemd-245/units/user/systemd-tmpfiles-clean.service
+--- systemd-245/units.org/user/systemd-tmpfiles-clean.service 2020-03-06 13:38:52.000000000 +0100
++++ systemd-245/units/user/systemd-tmpfiles-clean.service 2020-04-03 21:08:42.151365700 +0200
+@@ -16,6 +16,6 @@
[Service]
Type=oneshot
--ExecStart=@rootbindir@/systemd-tmpfiles --clean
-+ExecStart=-@rootbindir@/systemd-tmpfiles --clean
+-ExecStart=systemd-tmpfiles --user --clean
++ExecStart=-systemd-tmpfiles --user --clean
SuccessExitStatus=DATAERR
IOSchedulingClass=idle
+diff -ur systemd-245/units.org/user/systemd-tmpfiles-setup.service systemd-245/units/user/systemd-tmpfiles-setup.service
+--- systemd-245/units.org/user/systemd-tmpfiles-setup.service 2020-03-06 13:38:52.000000000 +0100
++++ systemd-245/units/user/systemd-tmpfiles-setup.service 2020-04-03 21:08:42.151365700 +0200
+@@ -18,7 +18,7 @@
+ [Service]
+ Type=oneshot
+ RemainAfterExit=yes
+-ExecStart=systemd-tmpfiles --user --create --remove --boot
++ExecStart=-systemd-tmpfiles --user --create --remove --boot
+ SuccessExitStatus=DATAERR
+
+ [Install]
+++ /dev/null
---- 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)
-+substs.set('rootsbindir', rootsbindir)
- substs.set('rootlibexecdir', rootlibexecdir)
- substs.set('systemunitdir', systemunitdir)
- substs.set('userunitdir', userunitdir)
-@@ -2667,7 +2668,7 @@
- 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,5 +17,5 @@
- [Service]
- Type=oneshot
- RemainAfterExit=yes
--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 @@
- Type=oneshot
- TimeoutSec=180
- RemainAfterExit=yes
--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