forked from pool/systemd
Accepting request 1113906 from Base:System
- Import commit 9674bb256205e6c643feadbcccfd1ee8feeee684 (merge of v254.5) For a complete list of changes, visit:6ed5b11298...9674bb2562
- Make sure to call %sysusers_create only when transfiletrigger is disabled. - systemd.spec: switch to %ldconfig_scriptlets - systemd.spec: add `%tmpfiles_create systemd-resolve` It's only needed by SLE distros since systemd packages rely on transtriggerfiles in Factory. - Import commit 6ed5b11298005e07509832881a0c5ff1a80bf225 (merge of v254.4) For a complete list of changes, visit:b6b4e5a8a8...6ed5b11298
OBS-URL: https://build.opensuse.org/request/show/1113906 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=403
This commit is contained in:
commit
c63ce78fdc
BIN
systemd-v254.3+suse.3.gb6b4e5a8a8.tar.xz
(Stored with Git LFS)
BIN
systemd-v254.3+suse.3.gb6b4e5a8a8.tar.xz
(Stored with Git LFS)
Binary file not shown.
3
systemd-v254.5+suse.5.g9674bb2562.tar.xz
Normal file
3
systemd-v254.5+suse.5.g9674bb2562.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:9dc2d8ed7ea59d5ab5a8e0662d9a0848f41b4235ac5da3728ecce64834299986
|
||||||
|
size 10349392
|
@ -1,3 +1,37 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 27 13:14:12 UTC 2023 - Franck Bui <fbui@suse.com>
|
||||||
|
|
||||||
|
- Import commit 9674bb256205e6c643feadbcccfd1ee8feeee684 (merge of v254.5)
|
||||||
|
|
||||||
|
For a complete list of changes, visit:
|
||||||
|
https://github.com/openSUSE/systemd/compare/6ed5b11298005e07509832881a0c5ff1a80bf225...9674bb256205e6c643feadbcccfd1ee8feeee684
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 27 10:12:48 UTC 2023 - Franck Bui <fbui@suse.com>
|
||||||
|
|
||||||
|
- Make sure to call %sysusers_create only when transfiletrigger is disabled.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 27 09:52:33 UTC 2023 - Franck Bui <fbui@suse.com>
|
||||||
|
|
||||||
|
- systemd.spec: switch to %ldconfig_scriptlets
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 27 07:31:06 UTC 2023 - Franck Bui <fbui@suse.com>
|
||||||
|
|
||||||
|
- systemd.spec: add `%tmpfiles_create systemd-resolve`
|
||||||
|
|
||||||
|
It's only needed by SLE distros since systemd packages rely on
|
||||||
|
transtriggerfiles in Factory.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 25 08:05:21 UTC 2023 - Franck Bui <fbui@suse.com>
|
||||||
|
|
||||||
|
- Import commit 6ed5b11298005e07509832881a0c5ff1a80bf225 (merge of v254.4)
|
||||||
|
|
||||||
|
For a complete list of changes, visit:
|
||||||
|
https://github.com/openSUSE/systemd/compare/b6b4e5a8a82d1f13f265a4ef170f2d13be82789a...6ed5b11298005e07509832881a0c5ff1a80bf225
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Sep 22 15:04:54 UTC 2023 - Franck Bui <fbui@suse.com>
|
Fri Sep 22 15:04:54 UTC 2023 - Franck Bui <fbui@suse.com>
|
||||||
|
|
||||||
|
30
systemd.spec
30
systemd.spec
@ -19,7 +19,7 @@
|
|||||||
%global flavor @BUILD_FLAVOR@%{nil}
|
%global flavor @BUILD_FLAVOR@%{nil}
|
||||||
|
|
||||||
%define min_kernel_version 4.5
|
%define min_kernel_version 4.5
|
||||||
%define archive_version +suse.3.gb6b4e5a8a8
|
%define archive_version +suse.5.g9674bb2562
|
||||||
|
|
||||||
%define _testsuitedir %{_systemd_util_dir}/tests
|
%define _testsuitedir %{_systemd_util_dir}/tests
|
||||||
%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
|
%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
|
||||||
@ -67,7 +67,7 @@
|
|||||||
|
|
||||||
Name: systemd%{?mini}
|
Name: systemd%{?mini}
|
||||||
URL: http://www.freedesktop.org/wiki/Software/systemd
|
URL: http://www.freedesktop.org/wiki/Software/systemd
|
||||||
Version: 254.3
|
Version: 254.5
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A System and Session Manager
|
Summary: A System and Session Manager
|
||||||
License: LGPL-2.1-or-later
|
License: LGPL-2.1-or-later
|
||||||
@ -440,7 +440,7 @@ see nss-mymachines(8) manpage for more details.
|
|||||||
|
|
||||||
%if %{with networkd} || %{with resolved}
|
%if %{with networkd} || %{with resolved}
|
||||||
%package network
|
%package network
|
||||||
Summary: systemd network and Network Name Resolution managers
|
Summary: Systemd Network And Network Name Resolution Managers
|
||||||
License: LGPL-2.1-or-later
|
License: LGPL-2.1-or-later
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
%systemd_requires
|
%systemd_requires
|
||||||
@ -782,7 +782,11 @@ export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
|
|||||||
-Doomd=%{when experimental} \
|
-Doomd=%{when experimental} \
|
||||||
-Drepart=%{when experimental} \
|
-Drepart=%{when experimental} \
|
||||||
-Dsysupdate=%{when experimental} \
|
-Dsysupdate=%{when experimental} \
|
||||||
|
%if %{with sd_boot}
|
||||||
-Dukify=%{when experimental} \
|
-Dukify=%{when experimental} \
|
||||||
|
%else
|
||||||
|
-Dukify=false \
|
||||||
|
%endif
|
||||||
\
|
\
|
||||||
-Dtests=%{when testsuite unsafe} \
|
-Dtests=%{when testsuite unsafe} \
|
||||||
-Dinstall-tests=%{when testsuite}
|
-Dinstall-tests=%{when testsuite}
|
||||||
@ -1126,11 +1130,8 @@ fi
|
|||||||
%posttrans -n udev%{?mini}
|
%posttrans -n udev%{?mini}
|
||||||
%regenerate_initrd_posttrans
|
%regenerate_initrd_posttrans
|
||||||
|
|
||||||
%post -n libudev%{?mini}1 -p %ldconfig
|
%ldconfig_scriptlets -n libsystemd0%{?mini}
|
||||||
%post -n libsystemd0%{?mini} -p %ldconfig
|
%ldconfig_scriptlets -n libudev%{?mini}1
|
||||||
|
|
||||||
%postun -n libudev%{?mini}1 -p %ldconfig
|
|
||||||
%postun -n libsystemd0%{?mini} -p %ldconfig
|
|
||||||
|
|
||||||
%if %{with machined}
|
%if %{with machined}
|
||||||
%pre container
|
%pre container
|
||||||
@ -1140,24 +1141,26 @@ fi
|
|||||||
%systemd_preun machines.target
|
%systemd_preun machines.target
|
||||||
|
|
||||||
%postun container
|
%postun container
|
||||||
%systemd_postun machines.target
|
|
||||||
%ldconfig
|
%ldconfig
|
||||||
|
%systemd_postun machines.target
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%post container
|
%post container
|
||||||
%if %{with machined}
|
%if %{with machined}
|
||||||
|
%ldconfig
|
||||||
%if %{without filetriggers}
|
%if %{without filetriggers}
|
||||||
%tmpfiles_create systemd-nspawn.conf
|
%tmpfiles_create systemd-nspawn.conf
|
||||||
%endif
|
%endif
|
||||||
%systemd_post machines.target
|
%systemd_post machines.target
|
||||||
%ldconfig
|
|
||||||
%{_systemd_util_dir}/rpm/fixlet-container-post.sh $1 || :
|
%{_systemd_util_dir}/rpm/fixlet-container-post.sh $1 || :
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with coredump}
|
%if %{with coredump}
|
||||||
%post coredump
|
%post coredump
|
||||||
|
%if %{without filetriggers}
|
||||||
%sysusers_create systemd-coredump.conf
|
%sysusers_create systemd-coredump.conf
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{with journal_remote}
|
%if %{with journal_remote}
|
||||||
%pre journal-remote
|
%pre journal-remote
|
||||||
@ -1167,7 +1170,9 @@ fi
|
|||||||
|
|
||||||
%post journal-remote
|
%post journal-remote
|
||||||
# Assume that all files shipped by systemd-journal-remove are owned by root.
|
# Assume that all files shipped by systemd-journal-remove are owned by root.
|
||||||
|
%if %{without filetriggers}
|
||||||
%sysusers_create systemd-remote.conf
|
%sysusers_create systemd-remote.conf
|
||||||
|
%endif
|
||||||
%systemd_post systemd-journal-gatewayd.service
|
%systemd_post systemd-journal-gatewayd.service
|
||||||
%systemd_post systemd-journal-remote.service
|
%systemd_post systemd-journal-remote.service
|
||||||
%systemd_post systemd-journal-upload.service
|
%systemd_post systemd-journal-upload.service
|
||||||
@ -1204,7 +1209,10 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
%if %{with resolved}
|
%if %{with resolved}
|
||||||
%ldconfig
|
%ldconfig
|
||||||
|
%if %{without filetriggers}
|
||||||
%sysusers_create systemd-resolve.conf
|
%sysusers_create systemd-resolve.conf
|
||||||
|
%tmpfiles_create systemd-resolve.conf
|
||||||
|
%endif
|
||||||
%systemd_post systemd-resolved.service
|
%systemd_post systemd-resolved.service
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -1271,7 +1279,9 @@ fi
|
|||||||
%systemd_pre systemd-oomd.service systemd-oomd.socket
|
%systemd_pre systemd-oomd.service systemd-oomd.socket
|
||||||
|
|
||||||
%post experimental
|
%post experimental
|
||||||
|
%if %{without filetriggers}
|
||||||
%sysusers_create systemd-oom.conf
|
%sysusers_create systemd-oom.conf
|
||||||
|
%endif
|
||||||
%systemd_post systemd-homed.service
|
%systemd_post systemd-homed.service
|
||||||
%systemd_post systemd-oomd.service systemd-oomd.socket
|
%systemd_post systemd-oomd.service systemd-oomd.socket
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user