Add mstflint kerner driver as a patch to kernel-hci (#5497)

SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec

@@ -5,7 +5,7 @@
 Summary:        Signed Linux Kernel for HCI
 Name:           kernel-hci-signed-%{buildarch}
 Version:        5.15.110.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -149,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %exclude /module_info.ld
 
 %changelog
+* Thu May 11 2023 Elaheh Dehghani <edehghani@microsoft.com> - 5.15.110.1-2
+- Enable mstflint driver for secure boot.
+
 * Mon May 01 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.110.1-1
 - Auto-upgrade to 5.15.110.1
 

SPECS/kernel-hci/config

@@ -2091,6 +2091,7 @@ CONFIG_VMWARE_VMCI=m
 # CONFIG_HABANA_AI is not set
 # CONFIG_UACCE is not set
 # CONFIG_PVPANIC is not set
+CONFIG_MSTFLINT=m
 # end of Misc devices
 
 #

SPECS/kernel-hci/kernel-hci.signatures.json

@@ -1,7 +1,7 @@
 {
   "Signatures": {
     "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
-    "config": "2919b1701d9ba079e06244246873adcac4da5a1d9e8406ed1c24b4345b6df0c2",
+    "config": "01065206d710b7988a46ffdb269ce609047064de077241c63b14b4492ecc34ba",
     "kernel-5.15.110.1.tar.gz": "c350b56f7cb0ab04ce44bd7701d68a2ec7a4466004f4065027271ef091a64516"
   }
 }

SPECS/kernel-hci/kernel-hci.spec

@@ -3,9 +3,9 @@
 %define uname_r %{version}-%{release}
 
 # find_debuginfo.sh arguments are set by default in rpm's macros.
-# The default arguments regenerate the build-id for vmlinux in the 
+# The default arguments regenerate the build-id for vmlinux in the
 # debuginfo package causing a mismatch with the build-id for vmlinuz in
-# the kernel package. Therefore, explicilty set the relevant default 
+# the kernel package. Therefore, explicilty set the relevant default
 # settings to prevent this behavior.
 %undefine _unique_build_ids
 %undefine _unique_debug_names
@@ -15,11 +15,10 @@
 %define arch x86_64
 %define archdir x86
 %define config_source %{SOURCE1}
-
 Summary:        Linux Kernel for HCI
 Name:           kernel-hci
 Version:        5.15.110.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -54,6 +53,7 @@ Patch22:        0023-net-mlx5-Bridge-rename-filter-fg-to-vlan_filter.patch
 Patch23:        0024-net-mlx5-Bridge-extract-VLAN-push-pop-actions-creati.patch
 Patch24:        0025-net-mlx5-Bridge-implement-infrastructure-for-VLAN-pr.patch
 Patch25:        0026-net-mlx5-Bridge-implement-QinQ-support.patch
+Patch26:        0027-mstflint-This-driver-enables-under-the-secure-boot.patch
 BuildRequires:  audit-devel
 BuildRequires:  bash
 BuildRequires:  bc
@@ -68,10 +68,10 @@ BuildRequires:  libmspack-devel
 BuildRequires:  openssl
 BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
+BuildRequires:  pciutils-devel
 BuildRequires:  procps-ng-devel
 BuildRequires:  python3-devel
 BuildRequires:  sed
-BuildRequires:  pciutils-devel
 Requires:       filesystem
 Requires:       kmod
 Requires(post): coreutils
@@ -195,6 +195,7 @@ manipulation of eBPF programs and maps.
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
 
 make mrproper
 
@@ -360,7 +361,7 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %files
 %defattr(-,root,root)
 %license COPYING
-%exclude %dir /usr/lib/debug
+%exclude %dir %{_libdir}/debug
 /boot/System.map-%{uname_r}
 /boot/config-%{uname_r}
 /boot/vmlinuz-%{uname_r}
@@ -428,6 +429,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %{_sysconfdir}/bash_completion.d/bpftool
 
 %changelog
+* Thu May 11 2023 Elaheh Dehghani <edehghani@microsoft.com> - 5.15.110.1-2
+- Enable mstflint driver for secure boot.
+
 * Mon May 01 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.110.1-1
 - Auto-upgrade to 5.15.110.1