Merge: redhat: Remove kernel-rt-kvm package

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

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

Upstream Status: RHEL-Only

As requested by the BU, we are stop delivering KVM modules in separate
packages on RT (kernel-rt-kvm).

Signed-off-by: Wander Lairson Costa <wander@redhat.com>

Approved-by: Jan Stancek <jstancek@redhat.com>
Approved-by: Eder Zulian <ezulian@redhat.com>
Approved-by: Clark Williams <williams@redhat.com>
Approved-by: Derek Barbosa <debarbos@redhat.com>
Approved-by: Valentin Schneider <vschneid@redhat.com>
Approved-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: Augusto Caringi <acaringi@redhat.com>

Author: caringi

redhat/Makefile

@@ -632,7 +632,6 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check
 		mod-denylist.sh \
 		mod-internal.list \
 		mod-partner.list \
-		mod-kvm.list \
 		mod-sign.sh \
 		scripts/uki_addons/uki_create_addons.py \
 		scripts/uki_addons/uki_addons.json \

redhat/kernel.spec.template

@@ -902,7 +902,6 @@ Source82: update_scripts.sh
 
 Source84: mod-internal.list
 Source85: mod-partner.list
-Source86: mod-kvm.list
 
 Source100: rheldup3.x509
 Source101: rhelkpatch1.x509
@@ -1330,24 +1329,6 @@ AutoProv: yes\
 This package provides kernel modules for the %{?2:%{2} }kernel package for Red Hat internal usage.\
 %{nil}
 
-%if %{with_realtime} || %{with_realtime_arm64_64k}
-#
-# this macro creates a kernel-<subpackage>-kvm package
-# %%kernel_kvm_package <subpackage>
-#
-%define kernel_kvm_package() \
-%package %{?1:%{1}-}kvm\
-Summary: KVM modules for package kernel%{?1:-%{1}}\
-Group: System Environment/Kernel\
-Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
-Provides: installonlypkg(kernel-module)\
-Provides: kernel%{?1:-%{1}}-kvm-%{_target_cpu} = %{version}-%{release}\
-AutoReq: no\
-%description -n kernel%{?1:-%{1}}-kvm\
-This package provides KVM modules for package kernel%{?1:-%{1}}.\
-%{nil}
-%endif
-
 #
 # This macro creates a kernel-<subpackage>-modules-extra package.
 #	%%kernel_modules_extra_package [-m] <subpackage> <pretty-name>
@@ -1481,9 +1462,6 @@ Requires: kernel%{?1:-%{1}}-uki-virt = %{version}-%{release}\
 Requires(pre): systemd >= 252-20\
 %endif\
 %endif\
-%if "%{1}" == "rt" || "%{1}" == "rt-debug" || "%{1}" == "rt-64k" || "%{1}" == "rt-64k-debug"\
-%{expand:%%kernel_kvm_package %{?1:%{1}}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
-%endif \
 %if %{with_gcov}\
 %{expand:%%kernel_gcov_package %{?1:%{1}}}\
 %endif\
@@ -2379,10 +2357,6 @@ BuildKernel() {
     # Identify modules in the kernel-modules-partner package
     %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE85} partner
 %endif
-    if [ "$Variant" = "rt" ] || [ "$Variant" = "rt-debug" ] || [ "$Variant" = "rt-64k" ] || [ "$Variant" = "rt-64k-debug" ]; then
-        # Identify modules in the kernel-rt-kvm package
-        %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE86} kvm
-    fi
 
     #
     # Generate the kernel-core and kernel-modules files lists
@@ -2404,10 +2378,6 @@ BuildKernel() {
     # don't include anything going int kernel-modules-partner in the file lists
     xargs rm -rf < mod-partner.list
 %endif
-    if [ "$Variant" = "rt" ] || [ "$Variant" = "rt-debug" ] || [ "$Variant" = "rt-64k" ] || [ "$Variant" = "rt-64k-debug" ]; then
-        # don't include anything going into kernel-rt-kvm in the file lists
-        xargs rm -rf < mod-kvm.list
-    fi
 
     if [ $DoModules -eq 1 ]; then
 	# Find all the module files and filter them out into the core and
@@ -2548,9 +2518,6 @@ BuildKernel() {
 %if 0%{!?fedora:1}
     rm -f $RPM_BUILD_ROOT/mod-partner.list
 %endif
-    if [ "$Variant" = "rt" ] || [ "$Variant" = "rt-debug" ] || [ "$Variant" = "rt-64k" ] || [ "$Variant" = "rt-64k-debug" ]; then
-        rm -f $RPM_BUILD_ROOT/mod-kvm.list
-    fi
 
 %if %{with_cross}
     make -C $RPM_BUILD_ROOT/lib/modules/$KernelVer/build M=scripts clean
@@ -3270,21 +3237,6 @@ fi\
 /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
 %{nil}
 
-%if %{with_realtime}
-#
-# This macro defines a %%post script for a kernel*-kvm package.
-# It also defines a %%postun script that does the same thing.
-#       %%kernel_kvm_post [<subpackage>]
-#
-%define kernel_kvm_post() \
-%{expand:%%post %{?1:%{1}-}kvm}\
-/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
-%{nil}\
-%{expand:%%postun %{?1:%{1}-}kvm}\
-/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
-%{nil}
-%endif
-
 #
 # This macro defines a %%post script for a kernel*-modules-partner package.
 # It also defines a %%postun script that does the same thing.
@@ -3365,9 +3317,6 @@ fi\
 %if 0%{!?fedora:1}\
 %{expand:%%kernel_modules_partner_post %{?-v*}}\
 %endif\
-%if "%{-v*}" == "rt" || "%{-v*}" == "rt-debug" || "%{-v*}" == "rt-64k" || "%{-v*}" == "rt-64k-debug"\
-%{expand:%%kernel_kvm_post %{?-v*}}\
-%endif\
 %{expand:%%kernel_variant_posttrans %{?-v*:-v %{-v*}}}\
 %{expand:%%post %{?-v*:%{-v*}-}core}\
 %{-r:\
@@ -3698,10 +3647,6 @@ fi
 %{expand:%%files %{?3:%{3}-}modules-partner}\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/partner\
 %endif\
-%if "%{3}" == "rt" || "%{3}" == "rt-debug" || "%{3}" == "rt-64k" || "%{3}" == "rt-64k-debug"\
-%{expand:%%files %{?3:%{3}-}kvm}\
-/lib/modules/%{KVERREL}%{?3:+%{3}}/kvm\
-%endif\
 %if %{with_debuginfo}\
 %ifnarch noarch\
 %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\