Split out systemd-boot-unsigned package

(cherry picked from commit 54a3b6f942abf61353782847df11012338157285)

Resolves: #2157663
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-04-27 15:45:25 +02:00 committed by Jan Macku
parent 5637d04f70
commit f2837adf41
2 changed files with 26 additions and 2 deletions

View File

@ -17,6 +17,7 @@ def files(root):
o_libs = open('.file-list-libs', 'w')
o_udev = open('.file-list-udev', 'w')
o_boot = open('.file-list-boot', 'w')
o_pam = open('.file-list-pam', 'w')
o_rpm_macros = open('.file-list-rpm-macros', 'w')
o_devel = open('.file-list-devel', 'w')
@ -133,7 +134,6 @@ for file in files(buildroot):
systemd-pcrphase|
systemd-measure|
/boot$|
/boot/efi|
/kernel/|
/kernel$|
/modprobe.d|
@ -147,6 +147,9 @@ for file in files(buildroot):
# confused if those user-facing binaries are not available.
o = o_udev
elif re.search(r'''/boot/efi''', n, re.X):
o = o_boot
elif re.search(r'''resolved|resolve1|
resolvectl|
systemd-resolve|

View File

@ -19,7 +19,7 @@
%bcond_without lto
Name: systemd
Url: https://www.freedesktop.org/wiki/Software/systemd
Url: https://systemd.io
Version: 252
Release: 7%{?dist}
# For a breakdown of the licensing, see README
@ -507,11 +507,30 @@ Requires: tpm2-tss%{?_isa}
Provides: u2f-hidraw-policy = 1.0.2-40
Obsoletes: u2f-hidraw-policy < 1.0.2-40
# self-obsoletes to install both packages after split of systemd-boot
Obsoletes: systemd-udev < 252.2^
%description udev
This package contains systemd-udev and the rules and hardware database
needed to manage device nodes. This package is necessary on physical
machines and in virtual machines, but not in containers.
%package boot-unsigned
Summary: UEFI boot manager (unsigned version)
Provides: systemd-boot-unsigned-%{efi_arch} = %version-%release
# self-obsoletes to install both packages after split of systemd-boot
Obsoletes: systemd-udev < 252.2^
%description boot-unsigned
systemd-boot (short: sd-boot) is a simple UEFI boot manager. It provides a
graphical menu to select the entry to boot and an editor for the kernel command
line. systemd-boot supports systems with UEFI firmware only.
This package contains the unsigned version. Install systemd-boot instead to get
the version that works with Secure Boot.
%package container
# Name is the same as in Debian
Summary: Tools for containers and VMs
@ -1081,6 +1100,8 @@ getent passwd systemd-oom &>/dev/null || useradd -r -l -g systemd-oom -d / -s /s
%files udev -f .file-list-udev
%files boot-unsigned -f .file-list-boot
%files container -f .file-list-container
%files journal-remote -f .file-list-remote