@@ -899,7 +899,6 @@ Source82: update_scripts.sh
899899
900900Source84: mod-internal.list
901901Source85: mod-partner.list
902- Source86: mod-kvm.list
903902
904903Source100: rheldup3.x509
905904Source101: rhelkpatch1.x509
@@ -1326,24 +1325,6 @@ AutoProv: yes\
13261325This package provides kernel modules for the %{?2:%{2} }kernel package for Red Hat internal usage.\
13271326%{nil}
13281327
1329- %if %{with_realtime} || %{with_realtime_arm64_64k}
1330- #
1331- # this macro creates a kernel-<subpackage>-kvm package
1332- # %%kernel_kvm_package <subpackage>
1333- #
1334- %define kernel_kvm_package() \
1335- %package %{?1:%{1}-}kvm\
1336- Summary: KVM modules for package kernel%{?1:-%{1}}\
1337- Group: System Environment/Kernel\
1338- Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
1339- Provides: installonlypkg(kernel-module)\
1340- Provides: kernel%{?1:-%{1}}-kvm-%{_target_cpu} = %{version}-%{release}\
1341- AutoReq: no\
1342- %description -n kernel%{?1:-%{1}}-kvm\
1343- This package provides KVM modules for package kernel%{?1:-%{1}}.\
1344- %{nil}
1345- %endif
1346-
13471328#
13481329# This macro creates a kernel-<subpackage>-modules-extra package.
13491330# %%kernel_modules_extra_package [-m] <subpackage> <pretty-name>
@@ -1477,9 +1458,6 @@ Requires: kernel%{?1:-%{1}}-uki-virt = %{version}-%{release}\
14771458Requires(pre): systemd >= 252-20\
14781459%endif\
14791460%endif\
1480- %if "%{1}" == "rt" || "%{1}" == "rt-debug" || "%{1}" == "rt-64k" || "%{1}" == "rt-64k-debug"\
1481- %{expand:%%kernel_kvm_package %{?1:%{1}}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
1482- %endif \
14831461%if %{with_gcov}\
14841462%{expand:%%kernel_gcov_package %{?1:%{1}}}\
14851463%endif\
@@ -2375,10 +2353,6 @@ BuildKernel() {
23752353 # Identify modules in the kernel-modules-partner package
23762354 %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE85} partner
23772355%endif
2378- if [ "$Variant" = "rt" ] || [ "$Variant" = "rt-debug" ] || [ "$Variant" = "rt-64k" ] || [ "$Variant" = "rt-64k-debug" ]; then
2379- # Identify modules in the kernel-rt-kvm package
2380- %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE86} kvm
2381- fi
23822356
23832357 #
23842358 # Generate the kernel-core and kernel-modules files lists
@@ -2400,10 +2374,6 @@ BuildKernel() {
24002374 # don't include anything going int kernel-modules-partner in the file lists
24012375 xargs rm -rf < mod-partner.list
24022376%endif
2403- if [ "$Variant" = "rt" ] || [ "$Variant" = "rt-debug" ] || [ "$Variant" = "rt-64k" ] || [ "$Variant" = "rt-64k-debug" ]; then
2404- # don't include anything going into kernel-rt-kvm in the file lists
2405- xargs rm -rf < mod-kvm.list
2406- fi
24072377
24082378 if [ $DoModules -eq 1 ]; then
24092379 # Find all the module files and filter them out into the core and
@@ -2544,9 +2514,6 @@ BuildKernel() {
25442514%if 0%{!?fedora:1}
25452515 rm -f $RPM_BUILD_ROOT/mod-partner.list
25462516%endif
2547- if [ "$Variant" = "rt" ] || [ "$Variant" = "rt-debug" ] || [ "$Variant" = "rt-64k" ] || [ "$Variant" = "rt-64k-debug" ]; then
2548- rm -f $RPM_BUILD_ROOT/mod-kvm.list
2549- fi
25502517
25512518%if %{with_cross}
25522519 make -C $RPM_BUILD_ROOT/lib/modules/$KernelVer/build M=scripts clean
@@ -3266,21 +3233,6 @@ fi\
32663233/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
32673234%{nil}
32683235
3269- %if %{with_realtime}
3270- #
3271- # This macro defines a %%post script for a kernel*-kvm package.
3272- # It also defines a %%postun script that does the same thing.
3273- # %%kernel_kvm_post [<subpackage>]
3274- #
3275- %define kernel_kvm_post() \
3276- %{expand:%%post %{?1:%{1}-}kvm}\
3277- /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
3278- %{nil}\
3279- %{expand:%%postun %{?1:%{1}-}kvm}\
3280- /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
3281- %{nil}
3282- %endif
3283-
32843236#
32853237# This macro defines a %%post script for a kernel*-modules-partner package.
32863238# It also defines a %%postun script that does the same thing.
@@ -3361,9 +3313,6 @@ fi\
33613313%if 0%{!?fedora:1}\
33623314%{expand:%%kernel_modules_partner_post %{?-v*}}\
33633315%endif\
3364- %if "%{-v*}" == "rt" || "%{-v*}" == "rt-debug" || "%{-v*}" == "rt-64k" || "%{-v*}" == "rt-64k-debug"\
3365- %{expand:%%kernel_kvm_post %{?-v*}}\
3366- %endif\
33673316%{expand:%%kernel_variant_posttrans %{?-v*:-v %{-v*}}}\
33683317%{expand:%%post %{?-v*:%{-v*}-}core}\
33693318%{-r:\
@@ -3694,10 +3643,6 @@ fi
36943643%{expand:%%files %{?3:%{3}-}modules-partner}\
36953644/lib/modules/%{KVERREL}%{?3:+%{3}}/partner\
36963645%endif\
3697- %if "%{3}" == "rt" || "%{3}" == "rt-debug" || "%{3}" == "rt-64k" || "%{3}" == "rt-64k-debug"\
3698- %{expand:%%files %{?3:%{3}-}kvm}\
3699- /lib/modules/%{KVERREL}%{?3:+%{3}}/kvm\
3700- %endif\
37013646%if %{with_debuginfo}\
37023647%ifnarch noarch\
37033648%{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\
0 commit comments