[OS-BUILD PATCHv4] redhat: remove kernel-rt-kvm package

[Clark Williams (via Email Bridge)]

From: Clark Williams

redhat: remove kernel-rt-kvm package

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: Juri Lelli 
Signed-off-by: Wander Lairson Costa 
Signed-off-by: Clark Williams

Conflicts:
    redhat/kernel.spec.template
    redhat/rhel_files/def_variants.yaml.rhel

diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1551,25 +1551,6 @@ Provides: installonlypkg(kernel)\
 The meta-package for the %{1} kernel\
 %{nil}

-%if %{with_realtime} || %{with_realtime_arm64_64k}
-#
-# this macro creates a kernel-rt-<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}}}\
-Requires: kernel%{?1:-%{1}}-modules-core-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> and its -devel and -debuginfo too.
 #	%%define variant_summary The Linux kernel compiled for <configuration>
@@ -1600,10 +1581,7 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %{
 %endif\
 %{expand:%%kernel_debuginfo_package %{?1:%{1}}}\
 %endif\
-%if "%{1}" == "rt" || "%{1}" == "rt-debug" || "%{1}" == "rt-64k" || "%{1}" == "rt-64k-debug"\
-%{expand:%%kernel_kvm_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
-%else \
-%if %{with_efiuki}\
+%if %{with_efiuki} && ("%{1}" != "rt" && "%{1}" != "rt-debug" && "%{1}" != "rt-64k" && "%{1}" != "rt-64k-debug")\
 %package %{?1:%{1}-}uki-virt\
 Summary: %{variant_summary} unified kernel image for virtual machines\
 Provides: installonlypkg(kernel)\
@@ -1618,7 +1596,6 @@ Provides: installonlypkg(kernel)\
 Requires: kernel%{?1:-%{1}}-uki-virt = %{specrpmversion}-%{release}\
 Requires(pre): systemd >= 254-1\
 %endif\
-%endif\
 %if %{with_gcov}\
 %{expand:%%kernel_gcov_package %{?1:%{1}}}\
 %endif\
@@ -2876,12 +2853,6 @@ BuildKernel() {
         create_module_file_list "kernel" ../modules.list ../kernel${Variant:+-${Variant}}-modules.list 0 0
         create_module_file_list "internal" ../modules-internal.list ../kernel${Variant:+-${Variant}}-modules-internal.list 0 1
         create_module_file_list "kernel" ../modules-extra.list ../kernel${Variant:+-${Variant}}-modules-extra.list 0 1
-        if [[ "$Variant" == "rt" || "$Variant" == "rt-debug" ]]; then
-            create_module_file_list "kvm" ../modules-rt-kvm.list ../kernel${Variant:+-${Variant}}-modules-rt-kvm.list 0 1
-        fi
-        if [[ "$Variant" == "rt-64k" || "$Variant" == "rt-64k-debug" ]]; then
-            create_module_file_list "kvm" ../modules-rt-64k-kvm.list ../kernel${Variant:+-${Variant}}-modules-rt-64k-kvm.list 0 1
-        fi
 %if 0%{!?fedora:1}
         create_module_file_list "partner" ../modules-partner.list ../kernel${Variant:+-${Variant}}-modules-partner.list 1 1
 %endif
@@ -3681,21 +3652,6 @@ fi\
 /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
 %{nil}

-%if %{with_realtime} || %{with_realtime_arm64_64k}
-#
-# 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 package.
 # It also defines a %%postun script that does the same thing.
@@ -3861,7 +3817,6 @@ fi\
 %if %{with_realtime_base}
 %kernel_variant_preun -v rt
 %kernel_variant_post -v rt -r kernel
-%kernel_kvm_post rt
 %endif

%if %{with_automotive_base}
@@ -3872,7 +3827,6 @@ fi\
 %if %{with_realtime} && %{with_debug}
 %kernel_variant_preun -v rt-debug
 %kernel_variant_post -v rt-debug
-%kernel_kvm_post rt-debug
 %endif

%if %{with_realtime_arm64_64k_base}
@@ -4169,14 +4123,7 @@ fi\
 %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\
 %endif\
 %endif\
-%if "%{3}" == "rt" || "%{3}" == "rt-debug" || "%{3}" == "rt-64k" || "%{3}" == "rt-64k-debug"\
-%if "%{3}" == "rt" || "%{3}" == "rt-debug"\
-%{expand:%%files -f kernel-%{?3:%{3}-}modules-rt-kvm.list %{?3:%{3}-}kvm}\
-%else\
-%{expand:%%files -f kernel-%{?3:%{3}-}modules-rt-64k-kvm.list %{?3:%{3}-}kvm}\
-%endif\
-%else\
-%if %{with_efiuki}\
+%if %{with_efiuki} && "%{3}" != "rt" && "%{3}" != "rt-debug" && "%{3}" != "rt-64k" && "%{3}" != "rt-64k-debug"\
 %{expand:%%files %{?3:%{3}-}uki-virt}\
 %dir /lib/modules\
 %dir /lib/modules/%{KVERREL}%{?3:+%{3}}\
@@ -4191,7 +4138,6 @@ fi\
 %dir /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-virt.efi.extra.d/ \
 /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-virt.efi.extra.d/*.addon.efi\
 %endif\
-%endif\
 %if %{?3:1} %{!?3:0}\
 %{expand:%%files %{3}}\
 %endif\
diff --git a/redhat/rhel_files/def_variants.yaml.rhel b/redhat/rhel_files/def_variants.yaml.rhel
index blahblah..blahblah 100644
--- a/redhat/rhel_files/def_variants.yaml.rhel
+++ b/redhat/rhel_files/def_variants.yaml.rhel
@@ -12,14 +12,6 @@ packages:
     depends-on:
     - modules-core
     - modules
-  - name: modules-rt-kvm
-    if_variant_in: ["rt"]
-    depends-on:
-    - modules-core
-  - name: modules-rt-64k-kvm
-    if_variant_in: ["rt-64k"]
-    depends-on:
-    - modules-core
   - name: modules-partner
     depends-on:
     - modules-core
@@ -30,11 +22,6 @@ rules:
     exact_pkg: True
   - .*test[^/]*.ko: modules-internal

-  - arch/x86/kvm/kvm(-amd|-intel|.).*: modules-rt-kvm
-    if_variant_in: ["rt"]
-  - arch/x86/kvm/kvm(-amd|-intel|.).*: modules-rt-64k-kvm
-    if_variant_in: ["rt-64k"]
-
   - arch/.*: modules-core
   - block/t10-pi.ko: modules-core
   - crypto/.*: modules-core
@@ -84,10 +71,6 @@ rules:
   - drivers/gpio/gpio-dln2.*: modules-extra
   - drivers/gpio/gpio-ljca.*: modules
   - drivers/gpio/.*: modules-core
-  - drivers/gpu/drm/i915/kvmgt.*: modules-rt-kvm
-    if_variant_in: ["rt"]
-  - drivers/gpu/drm/i915/kvmgt.*: modules-rt-64k-kvm
-    if_variant_in: ["rt-64k"]
   - drivers/gpu/drm/display/drm_.*: modules-core
   - drivers/gpu/drm/drm.*: modules-core
   - drivers/gpu/drm/etnaviv/.*: modules-core
@@ -264,10 +247,6 @@ rules:
   - drivers/powercap/intel_rapl_tpmi.*: modules
   - drivers/powercap/.*: modules-core
   - drivers/pps/.*: modules-core
-  - drivers/ptp/ptp_kvm.*: modules-rt-kvm
-    if_variant_in: ["rt"]
-  - drivers/ptp/ptp_kvm.*: modules-rt-64k-kvm
-    if_variant_in: ["rt-64k"]
   - drivers/ptp/ptp_mock.*: modules-internal
   - drivers/ptp/ptp_dfl_tod.*: modules
   - drivers/ptp/.*: modules-core
diff --git a/redhat/scripts/filtermods-testdata/test1.yaml b/redhat/scripts/filtermods-testdata/test1.yaml
index blahblah..blahblah 100644
--- a/redhat/scripts/filtermods-testdata/test1.yaml
+++ b/redhat/scripts/filtermods-testdata/test1.yaml
@@ -7,14 +7,13 @@ packages:
   - name: modules-extra
     depends-on:
     - modules-core
-  - name: rt-kvm
+  - name: modules-other
     if_variant_in: ["rt"]
     depends-on:
     - modules-core

rules:
   - kmod[2]: modules-core
-  - kmod4: rt-kvm
+  - kmod4: modules-other
     if_variant_in: ["rt"]
   - default: modules
-
diff --git a/redhat/scripts/filtermods.adoc b/redhat/scripts/filtermods.adoc
index blahblah..blahblah 100644
--- a/redhat/scripts/filtermods.adoc
+++ b/redhat/scripts/filtermods.adoc
@@ -81,9 +81,7 @@ Filenames are derived from package names defined in yaml config.

==== variants (-r option)
 This option conditionally enables parts of config which are specific
-to provided variants. A good example is -rt variant, which is 99% identical
-to base kernel, with the exception of kvm subpackage. It's an alternative
-to creating entirely new yaml config that would be 99% identical with base one.
+to provided variants.
 Sample usage can be seen in `filtermods-testdata/test1.yaml`.

==== graphviz (-g option)
@@ -241,7 +239,7 @@ $ ./redhat/scripts/filtermods.py cmp2rpm -c redhat/rhel_files/def_variants.yaml.
 === selftest
 $ filtermods.py selftest [-h] [-g]

-Run selftests using data from filtermods-testdata directory. 
+Run selftests using data from filtermods-testdata directory.

== How does it work?
 It is inspired by "label propagation algorithm". Each kmod keeps a
diff --git a/redhat/scripts/filtermods.py b/redhat/scripts/filtermods.py
index blahblah..blahblah 100755
--- a/redhat/scripts/filtermods.py
+++ b/redhat/scripts/filtermods.py
@@ -823,11 +823,12 @@ class FiltermodTests(unittest.TestCase):
                                                    do_pictures=FiltermodTests.do_pictures,
                                                    variants=['rt'])

-        self.assertIsNotNone(self.pkg_list.get('rt-kvm'))
+        self.assertIsNotNone(self.pkg_list.get('modules-other'))
         self._is_kmod_pkg('kmod1', 'modules-core')
         self._is_kmod_pkg('kmod2', 'modules-core')
         self._is_kmod_pkg('kmod3', 'modules')
-        self._is_kmod_pkg('kmod4', 'rt-kvm')
+        self._is_kmod_pkg('kmod4', 'modules-other')
+

def test2(self):
         self.pkg_list, self.kmod_list = sort_kmods(get_td('test2.dep'), get_td('test2.yaml'),

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3837