From 54a3b6f942abf61353782847df11012338157285 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Dec 02 2022 18:08:56 +0000 Subject: Split out systemd-boot-unsigned package --- diff --git a/split-files.py b/split-files.py index a5f8f1e..783a284 100644 --- a/split-files.py +++ b/split-files.py @@ -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| systemd-resolve| resolvconf| diff --git a/systemd.spec b/systemd.spec index 6415dbf..5596e4e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -28,7 +28,7 @@ %bcond_with inplace Name: systemd -Url: https://www.freedesktop.org/wiki/Software/systemd +Url: https://systemd.io %if %{without inplace} Version: 252.2 %else @@ -331,6 +331,9 @@ Requires: kbd 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 @@ -341,6 +344,22 @@ This package also provides systemd-timesyncd, a network time protocol daemon. It also contains tools to manage encrypted home areas and secrets bound to the machine, and to create or grow partitions and make file systems automatically. +%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 @@ -994,6 +1013,8 @@ fi %files udev -f .file-list-udev +%files boot-unsigned -f .file-list-boot + %files container -f .file-list-container %ghost %dir %attr(0700,-,-) /var/lib/machines