rollback mft_kernel rpm name and add provides for kernel-mft (#12072)

Co-authored-by: Binu Jose Philip <[email protected]>
microsoft · Jan 26, 2025 · 76dcc08 · 76dcc08
1 parent b06765c
commit 76dcc08
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 29 deletions.
diff --git a/SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec b/SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec
@@ -19,7 +19,7 @@ Group:           System Environment/Kernel
 #   3. Place the unsigned package and signed binary in this spec's folder
 #   4. Build this spec
 
-Source0:        kernel-mft-%{version}-%{release}.%{_arch}.rpm
+Source0:        %{name}-%{version}-%{release}.%{_arch}.rpm
 Source1:        mst_pci.ko
 Source2:        mst_pciconf.ko
 Vendor:         Microsoft Corporation
@@ -29,19 +29,13 @@ ExclusiveArch:  x86_64
 Requires:       kernel = %{target_kernel_version_full}
 Requires:       kmod
 
-%description
-mft kernel module(s)
-
 # Azure Linux attempts to match the spec file name and the "Name" tag.
 # Upstream's mft_kernel spec set rpm name as kernel-mft. To comply, we
-# set "Name" as mft_kernel but force a build of kernel-mft rpm and
-# prevent mft_kernel rpm. A %files section is declared for kernel-mft
-# but not for mft_kernel which is the default rpm.
-%package -n kernel-mft
-Summary: kernel-mft Kernel Module for the %{KVERSION} kernel
+# set "Name" as mft_kernel but add a "Provides" for kernel-mft.
+Provides:       kernel-mft = %{version}-%{release}
 
-%description -n kernel-mft
-This package provides a kernel-mft kernel module.
+%description
+mft kernel module(s)
 
 %global debug_package %{nil}
 
@@ -65,9 +59,9 @@ rm -rf %{buildroot}
 %postun
 /sbin/depmod %{KVERSION}
 
-%files -n kernel-mft
+%files
 %defattr(-,root,root,-)
-%license %{_defaultlicensedir}/kernel-mft/COPYING
+%license %{_defaultlicensedir}/%{name}/COPYING
 /lib/modules/%{KVERSION}/updates/
 
 %changelog

diff --git a/SPECS/mft_kernel/mft_kernel.spec b/SPECS/mft_kernel/mft_kernel.spec
@@ -53,20 +53,13 @@ BuildRequires:  kmod
 Requires:       kernel = %{target_kernel_version_full}
 Requires:       kmod
 
-%description
-mft kernel module(s)
-
 # Azure Linux attempts to match the spec file name and the "Name" tag.
 # Upstream's mft_kernel spec set rpm name as kernel-mft. To comply, we
-# set "Name" as mft_kernel but force a build of kernel-mft rpm and
-# prevent mft_kernel rpm. A %files section is declared for kernel-mft
-# but not for mft_kernel which is the default rpm.
-%package -n kernel-mft
-Summary: kernel-mft Kernel Module for the %{KVERSION} kernel
-
-%description -n kernel-mft
-This package provides a kernel-mft kernel module.
+# set "Name" as mft_kernel but add a "Provides" for kernel-mft.
+Provides:       kernel-mft = %{version}-%{release}
 
+%description
+mft kernel module(s)
 
 %global debug_package %{nil}
 
@@ -214,12 +207,8 @@ find %{buildroot} -type f -name \*.ko -exec %{__strip} -p --strip-debug --discar
 %postun
 /sbin/depmod %{KVERSION}
 
-# Install license file to %{_defaultlicensedir}/kernel-mft for %files to pick-up
-# and set license metadata correct
-%define licensedir %{_defaultlicensedir}/kernel-mft/
-
 %if "%{KMP}" != "1"
-%files -n kernel-mft
+%files
 %defattr(-,root,root,-)
 %license source/COPYING
 /lib/modules/%{KVERSION}/%{install_mod_dir}/