Accepting request 1132619 from Base:System
- Explicitely provide 'group(systemd-journal)' from the main package (bsc#1217852) - Import commit ce08cd5f66e1a661c2b9ed764ad7036decd76503 ce08cd5f66 man/standard-conf: directory paths should end with '/' 8324cbfde7 config files: update their header to reflect that they can be installed in /usr bc36846ad2 Reflect the fact that main config files can be installed in /usr e304a11f33 config files: more recommendations of `systemd-analyze cat-config` c45cecf279 meson: add build option for install path of main config files cc61b052c6 vconsole-setup: use a consistent log level when setfont fails with EX_OSERR (bsc#1212970) 4fe3653dab tmpfiles: ignore EINVAL with --graceful (bsc#1216628) OBS-URL: https://build.opensuse.org/request/show/1132619 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=409
This commit is contained in:
commit
e923ad2f02
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ec66792689d2f375003dbdf4328f90f633f9ac9a61e39fa5067bb976b9da75ca
|
||||
size 10350532
|
3
systemd-v254.5+suse.17.gce08cd5f66.tar.xz
Normal file
3
systemd-v254.5+suse.17.gce08cd5f66.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:85fcae5c382ca7b6a635a103888097b96c1436c165206a342e6713aa482c84f4
|
||||
size 10351072
|
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 12 08:02:52 UTC 2023 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Explicitely provide 'group(systemd-journal)' from the main package (bsc#1217852)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 12 07:43:35 UTC 2023 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Import commit ce08cd5f66e1a661c2b9ed764ad7036decd76503
|
||||
|
||||
ce08cd5f66 man/standard-conf: directory paths should end with '/'
|
||||
8324cbfde7 config files: update their header to reflect that they can be installed in /usr
|
||||
bc36846ad2 Reflect the fact that main config files can be installed in /usr
|
||||
e304a11f33 config files: more recommendations of `systemd-analyze cat-config`
|
||||
c45cecf279 meson: add build option for install path of main config files
|
||||
cc61b052c6 vconsole-setup: use a consistent log level when setfont fails with EX_OSERR (bsc#1212970)
|
||||
4fe3653dab tmpfiles: ignore EINVAL with --graceful (bsc#1216628)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 21 13:57:52 UTC 2023 - Wolfgang Frisch <wolfgang.frisch@suse.com>
|
||||
|
||||
|
18
systemd.spec
18
systemd.spec
@ -18,7 +18,7 @@
|
||||
|
||||
%global flavor @BUILD_FLAVOR@%{nil}
|
||||
|
||||
%define archive_version +suse.10.gb53f364c26
|
||||
%define archive_version +suse.17.gce08cd5f66
|
||||
|
||||
%define _testsuitedir %{_systemd_util_dir}/tests
|
||||
%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
|
||||
@ -151,6 +151,7 @@ Requires(post): pam-config >= 0.79-5
|
||||
Recommends: libpcre2-8-0
|
||||
Recommends: libbpf0
|
||||
%endif
|
||||
Provides: group(systemd-journal)
|
||||
Conflicts: filesystem < 11.5
|
||||
Conflicts: mkinitrd < 2.7.0
|
||||
Provides: sbin_init
|
||||
@ -715,6 +716,7 @@ export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
|
||||
-Drootprefix=/usr \
|
||||
-Dsplit-usr=true \
|
||||
%endif
|
||||
-Dconfigfiledir=/usr/lib \
|
||||
-Dsplit-bin=true \
|
||||
-Dsystem-uid-max=499 \
|
||||
-Dsystem-gid-max=499 \
|
||||
@ -826,18 +828,8 @@ install -m0755 -D %{SOURCE3} %{buildroot}/%{_systemd_util_dir}/systemd-update-he
|
||||
install -m0755 -D %{SOURCE4} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-install
|
||||
%endif
|
||||
|
||||
# For some reasons, upstream refuses to add a new build option (see pr#29244)
|
||||
# for customizing the installation path of main config files. However we want to
|
||||
# store them in /usr/lib so we don't encourage users to modify them while they
|
||||
# still can serve as templates.
|
||||
for f in %{buildroot}%{_sysconfdir}/systemd/*.conf; do
|
||||
mv $f %{buildroot}%{_systemd_util_dir}/
|
||||
done
|
||||
for f in %{buildroot}%{_sysconfdir}/udev/*.conf; do
|
||||
# Drop-ins are currently not supported by udevd.
|
||||
[ $(basename $f) = "udev.conf" ] && continue
|
||||
mv $f %{buildroot}%{_prefix}/lib/udev/
|
||||
done
|
||||
# Drop-ins are currently not supported by udev.
|
||||
mv %{buildroot}%{_prefix}/lib/udev/udev.conf %{buildroot}%{_sysconfdir}/udev/
|
||||
|
||||
# Install the fixlets
|
||||
mkdir -p %{buildroot}%{_systemd_util_dir}/rpm
|
||||
|
Loading…
Reference in New Issue
Block a user