Merge: kernel.spec: add '-e' option to %preun for kernel-core and kernel-uki-virt

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7213

JIRA: https://issues.redhat.com/browse/RHEL-107668

Because kernel-install from systemd (see PR 37897) now takes a new argument '--entry-type type1|type2'.
Only scriptlet %preun section needs to add.

This is useful both kernel-core and kernel-uki-virt are installed for the same kernel version
In this context, 'type1' refers to core, and 'type2' refers to uki.

Resolve: RHEL-104228
Refer to systemd/systemd#37897

Signed-off-by: Xuemin Li <xuli@redhat.com>
(cherry picked from commit bf6016e7a04a18da5b1886e07ab112c58619dc7d)
Signed-off-by: Xuemin Li <xuli@redhat.com>

Approved-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Approved-by: Jan Stancek <jstancek@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: Jarod Wilson <jarod@redhat.com>

Author: jarodwilson

redhat/kernel.spec.template

@@ -3287,11 +3287,18 @@ touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?-v:+%
 
 #
 # This macro defines a %%preun script for a kernel package.
-#	%%kernel_variant_preun [-v <subpackage>] [-u uki-suffix]
+#	%%kernel_variant_preun [-v <subpackage>] -u [uki-suffix] -e
+# Add kernel-install's --entry-type=type1|type2|all option (if supported) to limit removal
+# to a specific boot entry type.
 #
-%define kernel_variant_preun(v:u:) \
+%define kernel_variant_preun(v:u:e) \
 %{expand:%%preun %{?-v:%{-v*}-}%{!?-u*:core}%{?-u*:uki-%{-u*}}}\
-/bin/kernel-install remove %{KVERREL}%{?-v:+%{-v*}} || exit $?\
+entry_type=""\
+%{-e: \
+/bin/kernel-install --help|grep -q -- '--entry-type=' &&\
+    entry_type="--entry-type %{!?-u:type1}%{?-u:type2}" \
+}\
+/bin/kernel-install remove %{KVERREL}%{?-v:+%{-v*}} $entry_type || exit $?\
 if [ -x %{_sbindir}/weak-modules ]\
 then\
     %{_sbindir}/weak-modules --remove-kernel %{KVERREL}%{?-v:+%{-v*}} || exit $?\
@@ -3300,10 +3307,10 @@ fi\
 
 %if %{efiuki}
 %kernel_variant_posttrans -u virt
-%kernel_variant_preun -u virt
+%kernel_variant_preun -u virt -e
 %endif
 
-%kernel_variant_preun
+%kernel_variant_preun -e
 %kernel_variant_post -r kernel-smp
 
 %if %{with_pae}
@@ -3349,9 +3356,9 @@ fi\
 %if %{with_debug}
 %if %{efiuki}
 %kernel_variant_posttrans -v debug -u virt
-%kernel_variant_preun -v debug -u virt
+%kernel_variant_preun -v debug -u virt -e
 %endif
-%kernel_variant_preun -v debug
+%kernel_variant_preun -v debug -e
 %kernel_variant_post -v debug
 %endif