commit 9117b9d789d05da3822b34a40c0733997e500242
Author: Jakub Bogusz <[email protected]>
Date: Mon Sep 27 19:39:29 2021 +0200
- added split-usr-fix patch (fix sysusers.d, sysctl.d, binfmt.d paths in
systemd.pc file with split /usr)
- package binfmt.d defaults dir
- release 2
systemd-split-usr-fix.patch | 23 +++++++++++++++++++++++
systemd.spec | 7 ++++---
2 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index 530b4c7..d48fd98 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -31,7 +31,7 @@ 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: 249.4
-Release: 1
+Release: 2
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
@@ -69,7 +69,7 @@ Patch1: config-pld.patch
Patch2: pld-sysv-network.patch
Patch3: tmpfiles-not-fatal.patch
Patch4: udev-ploop-rules.patch
-
+Patch5: %{name}-split-usr-fix.patch
Patch6: net-rename-revert.patch
Patch7: %{name}-completion.patch
Patch8: proc-hidepid.patch
@@ -728,7 +728,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
%patch2 -p1
%patch3 -p1
%patch4 -p1
-
+%patch5 -p1
# rejected upstream (do not disable!)
%patch6 -p1
%patch7 -p1
@@ -1634,6 +1634,7 @@ fi
%dir %{_sysconfdir}/systemd/system-preset
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/systemd/system-preset/default.preset
%dir %{_sysconfdir}/tmpfiles.d
+%dir %{_prefix}/lib/binfmt.d
%dir %{_prefix}/lib/environment.d
%dir %{_prefix}/lib/modules-load.d
%dir %{_prefix}/lib/sysctl.d
diff --git a/systemd-split-usr-fix.patch b/systemd-split-usr-fix.patch
new file mode 100644
index 0000000..13175b3
--- /dev/null
+++ b/systemd-split-usr-fix.patch
@@ -0,0 +1,23 @@
+--- systemd-stable-249.4/src/core/systemd.pc.in.orig 2021-08-24
13:04:08.000000000 +0200
++++ systemd-stable-249.4/src/core/systemd.pc.in 2021-09-27
19:10:02.119608114 +0200
+@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_di
+ tmpfiles_dir=${prefix}/lib/tmpfiles.d
+ tmpfilesdir=${tmpfiles_dir}
+
+-sysusers_dir=${rootprefix}/lib/sysusers.d
++sysusers_dir=${prefix}/lib/sysusers.d
+ sysusersdir=${sysusers_dir}
+
+-sysctl_dir=${rootprefix}/lib/sysctl.d
++sysctl_dir=${prefix}/lib/sysctl.d
+ sysctldir=${sysctl_dir}
+
+-binfmt_dir=${rootprefix}/lib/binfmt.d
++binfmt_dir=${prefix}/lib/binfmt.d
+ binfmtdir=${binfmt_dir}
+
+-modules_load_dir=${rootprefix}/lib/modules-load.d
++modules_load_dir=${prefix}/lib/modules-load.d
+ modulesloaddir=${modules_load_dir}
+
+ catalog_dir=${prefix}/lib/systemd/catalog
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/9117b9d789d05da3822b34a40c0733997e500242
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
