Accepting request 850486 from home:fbui:systemd:openSUSE-Factory
- Don't post-require systemd-default-settings-branding anymore This is actually not needed now that the branding package issues a PID1 reloading every times it's being updated. - Import commit 49caf8e37aba04841e5493ccc25e7edab462d95b f8f7286527 units: restore sysfs conditions in sys-fs-fuse-connections.mount and sys-kernel-config.mount e9c7158dc7 units: wait until some fs modules are entirely loaded before mounting their corresponding filesystem (bsc#1178631) ac7ddc4201 Revert "units: skip modprobe@.service if the unit appears to be already loaded" 17310a1d19 core: serialize u->pids until the processes have been moved to the scope cgroup (bsc#1174436) 1416965614 meson: add option to skip installing to $sysconfdir f71a1ef5d0 systemctl: give a nice hint about org.freedesktop.LogControl1 when applicable 20a3f9fd95 systemctl: immediately reject invalid log levels 9f67d2e57b systemctl: merge log_target(), log_level(), service_log_setting() ddf7cf4872 systemctl: add service-log-{level,target} verbs 026d7d156d systemctl: list unit introspection verbs first, modification second - systemd-default-settings is needed by %post scriptlet - Revert the change that dropped %{release} from the package version constraints used in Requires: The release number is actually relevant since it can be increased when some patches, which might touch multiple sub-packages of systemd, are added/modified. However the %{release} is still no more used in conflicts. - Don't post-require systemd-default-settings-branding anymore This is actually not needed now that the branding package issues a PID1 reloading every times it's being updated. - Import commit 49caf8e37aba04841e5493ccc25e7edab462d95b OBS-URL: https://build.opensuse.org/request/show/850486 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1126
This commit is contained in:
parent
e972ea0ceb
commit
da3eeb4bf2
@ -1,3 +1,44 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 24 13:39:28 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Don't post-require systemd-default-settings-branding anymore
|
||||
|
||||
This is actually not needed now that the branding package issues a
|
||||
PID1 reloading every times it's being updated.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 23 17:20:28 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Import commit 49caf8e37aba04841e5493ccc25e7edab462d95b
|
||||
|
||||
f8f7286527 units: restore sysfs conditions in sys-fs-fuse-connections.mount and sys-kernel-config.mount
|
||||
e9c7158dc7 units: wait until some fs modules are entirely loaded before mounting their corresponding filesystem (bsc#1178631)
|
||||
ac7ddc4201 Revert "units: skip modprobe@.service if the unit appears to be already loaded"
|
||||
17310a1d19 core: serialize u->pids until the processes have been moved to the scope cgroup (bsc#1174436)
|
||||
1416965614 meson: add option to skip installing to $sysconfdir
|
||||
f71a1ef5d0 systemctl: give a nice hint about org.freedesktop.LogControl1 when applicable
|
||||
20a3f9fd95 systemctl: immediately reject invalid log levels
|
||||
9f67d2e57b systemctl: merge log_target(), log_level(), service_log_setting()
|
||||
ddf7cf4872 systemctl: add service-log-{level,target} verbs
|
||||
026d7d156d systemctl: list unit introspection verbs first, modification second
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 20 14:54:55 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- systemd-default-settings is needed by %post scriptlet
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 17 08:44:10 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Revert the change that dropped %{release} from the package version
|
||||
constraints used in Requires:
|
||||
|
||||
The release number is actually relevant since it can be increased
|
||||
when some patches, which might touch multiple sub-packages of
|
||||
systemd, are added/modified.
|
||||
|
||||
However the %{release} is still no more used in conflicts.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 6 08:34:18 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
|
@ -26,7 +26,7 @@
|
||||
##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
|
||||
%define mini -mini
|
||||
%define min_kernel_version 4.5
|
||||
%define suse_version +suse.32.gfdce77ce20
|
||||
%define suse_version +suse.43.g49caf8e37a
|
||||
|
||||
%bcond_with gnuefi
|
||||
%if 0%{?bootstrap}
|
||||
@ -115,7 +115,7 @@ BuildRequires: gnu-efi
|
||||
%if 0%{?bootstrap}
|
||||
#!BuildIgnore: dbus-1
|
||||
Requires: this-is-only-for-build-envs
|
||||
Provides: systemd = %{version}
|
||||
Provides: systemd = %{version}-%{release}
|
||||
%else
|
||||
# the buildignore is important for bootstrapping
|
||||
#!BuildIgnore: udev
|
||||
@ -125,7 +125,7 @@ Requires: kmod >= 15
|
||||
Requires: netcfg >= 11.5
|
||||
Requires: systemd-default-settings-branding
|
||||
Requires: systemd-presets-branding
|
||||
Requires: udev = %{version}
|
||||
Requires: udev = %{version}-%{release}
|
||||
Requires: util-linux >= 2.27.1
|
||||
Requires: group(lock)
|
||||
Requires(post): coreutils
|
||||
@ -142,7 +142,7 @@ Conflicts: sysvinit
|
||||
Conflicts: filesystem < 11.5
|
||||
Conflicts: mkinitrd < 2.7.0
|
||||
Obsoletes: systemd-analyze < 201
|
||||
Provides: systemd-analyze = %{version}
|
||||
Provides: systemd-analyze = %{version}-%{release}
|
||||
Obsoletes: pm-utils <= 1.4.1
|
||||
Obsoletes: suspend <= 1.0
|
||||
Source0: systemd-v%{version}%{suse_version}.tar.xz
|
||||
@ -211,7 +211,7 @@ The HTML documentation for systemd.
|
||||
Summary: Development headers for systemd
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libsystemd0%{?mini} = %{version}
|
||||
Requires: libsystemd0%{?mini} = %{version}-%{release}
|
||||
Requires: systemd-rpm-macros
|
||||
%if 0%{?bootstrap}
|
||||
Conflicts: systemd-devel
|
||||
@ -224,10 +224,10 @@ Development headers and auxiliary files for developing applications for systemd.
|
||||
Summary: System V init tools
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: sbin_init
|
||||
Conflicts: otherproviders(sbin_init)
|
||||
Provides: systemd-sysvinit = %{version}
|
||||
Provides: systemd-sysvinit = %{version}-%{release}
|
||||
Provides: sysvinit:/sbin/init
|
||||
|
||||
%description sysvinit
|
||||
@ -283,7 +283,7 @@ Conflicts: util-linux < 2.16
|
||||
Conflicts: ConsoleKit < 0.4.1
|
||||
Requires: filesystem
|
||||
%if 0%{?bootstrap}
|
||||
Provides: udev = %{version}
|
||||
Provides: udev = %{version}-%{release}
|
||||
Conflicts: libudev1
|
||||
Conflicts: udev
|
||||
# avoid kiwi picking it for bootstrap
|
||||
@ -316,9 +316,9 @@ access to udev device information
|
||||
Summary: Development files for libudev
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/Other
|
||||
Requires: libudev%{?mini}1 = %{version}
|
||||
Requires: libudev%{?mini}1 = %{version}-%{release}
|
||||
%if 0%{?bootstrap}
|
||||
Provides: libudev-devel = %{version}
|
||||
Provides: libudev-devel = %{version}-%{version}
|
||||
Conflicts: libudev1 = %{version}
|
||||
Conflicts: libudev-devel
|
||||
%endif
|
||||
@ -332,7 +332,7 @@ dynamic library, which provides access to udev device information.
|
||||
Summary: Systemd tools for coredump management
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%systemd_requires
|
||||
Provides: systemd:%{_bindir}/coredumpctl
|
||||
|
||||
@ -346,7 +346,7 @@ This package contains systemd-coredump, coredumpctl.
|
||||
Summary: Systemd tools for container management
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%systemd_requires
|
||||
Provides: systemd:%{_bindir}/systemd-nspawn
|
||||
%if 0%{?bootstrap}
|
||||
@ -364,7 +364,7 @@ and systemd-importd.
|
||||
Summary: Systemd tools for networkd and resolved
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: systemd:/usr/lib/systemd/systemd-networkd
|
||||
Provides: systemd:/usr/lib/systemd/systemd-resolved
|
||||
%systemd_requires
|
||||
@ -380,7 +380,7 @@ resolver tools for resolved
|
||||
Summary: Systemd tools for portable services
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%systemd_requires
|
||||
|
||||
%description portable
|
||||
@ -442,7 +442,7 @@ To activate this NSS module, you will need to include it in
|
||||
Summary: Plugin for local hostname resolution via systemd-resolved
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
Requires: %{name}-network = %{version}
|
||||
Requires: %{name}-network = %{version}-%{release}
|
||||
|
||||
%description -n nss-resolve
|
||||
This package contains a plug-in module for the Name Service Switch
|
||||
@ -476,7 +476,7 @@ To activate this NSS module, you will need to include it in
|
||||
Summary: Gateway for serving journal events over the network using HTTP
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:004c6f73d42c28b4706a44c3da99e8c8054ed324b4e77422abdcde0a93caa757
|
||||
size 6552480
|
3
systemd-v246.6+suse.43.g49caf8e37a.tar.xz
Normal file
3
systemd-v246.6+suse.43.g49caf8e37a.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3a3e6d4d4147e2df3a00ba26cc230188a2bdcc7ac650c039028a851ec360d295
|
||||
size 6554844
|
@ -1,3 +1,44 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 24 13:39:28 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Don't post-require systemd-default-settings-branding anymore
|
||||
|
||||
This is actually not needed now that the branding package issues a
|
||||
PID1 reloading every times it's being updated.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 23 17:20:28 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Import commit 49caf8e37aba04841e5493ccc25e7edab462d95b
|
||||
|
||||
f8f7286527 units: restore sysfs conditions in sys-fs-fuse-connections.mount and sys-kernel-config.mount
|
||||
e9c7158dc7 units: wait until some fs modules are entirely loaded before mounting their corresponding filesystem (bsc#1178631)
|
||||
ac7ddc4201 Revert "units: skip modprobe@.service if the unit appears to be already loaded"
|
||||
17310a1d19 core: serialize u->pids until the processes have been moved to the scope cgroup (bsc#1174436)
|
||||
1416965614 meson: add option to skip installing to $sysconfdir
|
||||
f71a1ef5d0 systemctl: give a nice hint about org.freedesktop.LogControl1 when applicable
|
||||
20a3f9fd95 systemctl: immediately reject invalid log levels
|
||||
9f67d2e57b systemctl: merge log_target(), log_level(), service_log_setting()
|
||||
ddf7cf4872 systemctl: add service-log-{level,target} verbs
|
||||
026d7d156d systemctl: list unit introspection verbs first, modification second
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 20 14:54:55 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- systemd-default-settings is needed by %post scriptlet
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 17 08:44:10 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Revert the change that dropped %{release} from the package version
|
||||
constraints used in Requires:
|
||||
|
||||
The release number is actually relevant since it can be increased
|
||||
when some patches, which might touch multiple sub-packages of
|
||||
systemd, are added/modified.
|
||||
|
||||
However the %{release} is still no more used in conflicts.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 6 08:34:18 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
|
32
systemd.spec
32
systemd.spec
@ -24,7 +24,7 @@
|
||||
%define bootstrap 0
|
||||
%define mini %nil
|
||||
%define min_kernel_version 4.5
|
||||
%define suse_version +suse.32.gfdce77ce20
|
||||
%define suse_version +suse.43.g49caf8e37a
|
||||
|
||||
%bcond_with gnuefi
|
||||
%if 0%{?bootstrap}
|
||||
@ -113,7 +113,7 @@ BuildRequires: gnu-efi
|
||||
%if 0%{?bootstrap}
|
||||
#!BuildIgnore: dbus-1
|
||||
Requires: this-is-only-for-build-envs
|
||||
Provides: systemd = %{version}
|
||||
Provides: systemd = %{version}-%{release}
|
||||
%else
|
||||
# the buildignore is important for bootstrapping
|
||||
#!BuildIgnore: udev
|
||||
@ -123,7 +123,7 @@ Requires: kmod >= 15
|
||||
Requires: netcfg >= 11.5
|
||||
Requires: systemd-default-settings-branding
|
||||
Requires: systemd-presets-branding
|
||||
Requires: udev = %{version}
|
||||
Requires: udev = %{version}-%{release}
|
||||
Requires: util-linux >= 2.27.1
|
||||
Requires: group(lock)
|
||||
Requires(post): coreutils
|
||||
@ -140,7 +140,7 @@ Conflicts: sysvinit
|
||||
Conflicts: filesystem < 11.5
|
||||
Conflicts: mkinitrd < 2.7.0
|
||||
Obsoletes: systemd-analyze < 201
|
||||
Provides: systemd-analyze = %{version}
|
||||
Provides: systemd-analyze = %{version}-%{release}
|
||||
Obsoletes: pm-utils <= 1.4.1
|
||||
Obsoletes: suspend <= 1.0
|
||||
Source0: systemd-v%{version}%{suse_version}.tar.xz
|
||||
@ -209,7 +209,7 @@ The HTML documentation for systemd.
|
||||
Summary: Development headers for systemd
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libsystemd0%{?mini} = %{version}
|
||||
Requires: libsystemd0%{?mini} = %{version}-%{release}
|
||||
Requires: systemd-rpm-macros
|
||||
%if 0%{?bootstrap}
|
||||
Conflicts: systemd-devel
|
||||
@ -222,10 +222,10 @@ Development headers and auxiliary files for developing applications for systemd.
|
||||
Summary: System V init tools
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: sbin_init
|
||||
Conflicts: otherproviders(sbin_init)
|
||||
Provides: systemd-sysvinit = %{version}
|
||||
Provides: systemd-sysvinit = %{version}-%{release}
|
||||
Provides: sysvinit:/sbin/init
|
||||
|
||||
%description sysvinit
|
||||
@ -281,7 +281,7 @@ Conflicts: util-linux < 2.16
|
||||
Conflicts: ConsoleKit < 0.4.1
|
||||
Requires: filesystem
|
||||
%if 0%{?bootstrap}
|
||||
Provides: udev = %{version}
|
||||
Provides: udev = %{version}-%{release}
|
||||
Conflicts: libudev1
|
||||
Conflicts: udev
|
||||
# avoid kiwi picking it for bootstrap
|
||||
@ -314,9 +314,9 @@ access to udev device information
|
||||
Summary: Development files for libudev
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/Other
|
||||
Requires: libudev%{?mini}1 = %{version}
|
||||
Requires: libudev%{?mini}1 = %{version}-%{release}
|
||||
%if 0%{?bootstrap}
|
||||
Provides: libudev-devel = %{version}
|
||||
Provides: libudev-devel = %{version}-%{version}
|
||||
Conflicts: libudev1 = %{version}
|
||||
Conflicts: libudev-devel
|
||||
%endif
|
||||
@ -330,7 +330,7 @@ dynamic library, which provides access to udev device information.
|
||||
Summary: Systemd tools for coredump management
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%systemd_requires
|
||||
Provides: systemd:%{_bindir}/coredumpctl
|
||||
|
||||
@ -344,7 +344,7 @@ This package contains systemd-coredump, coredumpctl.
|
||||
Summary: Systemd tools for container management
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%systemd_requires
|
||||
Provides: systemd:%{_bindir}/systemd-nspawn
|
||||
%if 0%{?bootstrap}
|
||||
@ -362,7 +362,7 @@ and systemd-importd.
|
||||
Summary: Systemd tools for networkd and resolved
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: systemd:/usr/lib/systemd/systemd-networkd
|
||||
Provides: systemd:/usr/lib/systemd/systemd-resolved
|
||||
%systemd_requires
|
||||
@ -378,7 +378,7 @@ resolver tools for resolved
|
||||
Summary: Systemd tools for portable services
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%systemd_requires
|
||||
|
||||
%description portable
|
||||
@ -440,7 +440,7 @@ To activate this NSS module, you will need to include it in
|
||||
Summary: Plugin for local hostname resolution via systemd-resolved
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Libraries
|
||||
Requires: %{name}-network = %{version}
|
||||
Requires: %{name}-network = %{version}-%{release}
|
||||
|
||||
%description -n nss-resolve
|
||||
This package contains a plug-in module for the Name Service Switch
|
||||
@ -474,7 +474,7 @@ To activate this NSS module, you will need to include it in
|
||||
Summary: Gateway for serving journal events over the network using HTTP
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
Loading…
Reference in New Issue
Block a user