diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 0bd52df99f6..018789396db 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -10,7 +10,7 @@ Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} Version: 5.15.148.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog +* Wed Feb 14 2024 Rachel Menge - 5.15.148.2-2 +- Bump release to match kernel + * Thu Feb 08 2024 CBL-Mariner Servicing Account - 5.15.148.2-1 - Auto-upgrade to 5.15.148.2 diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index b75a1cbde26..981e48b3806 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -12,7 +12,7 @@ Summary: Linux API header files Name: kernel-headers Version: 5.15.148.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -73,6 +73,9 @@ done %endif %changelog +* Wed Feb 14 2024 Rachel Menge - 5.15.148.2-2 +- Bump release to match kernel + * Thu Feb 08 2024 CBL-Mariner Servicing Account - 5.15.148.2-1 - Auto-upgrade to 5.15.148.2 diff --git a/SPECS/kernel/config b/SPECS/kernel/config index ffea82b9b49..7fed67e8adc 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -2177,7 +2177,7 @@ CONFIG_SCSI_MPT3SAS=y CONFIG_SCSI_MPT2SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_MAX_SGE=128 CONFIG_SCSI_MPT2SAS=y -# CONFIG_SCSI_MPI3MR is not set +CONFIG_SCSI_MPI3MR=m CONFIG_SCSI_SMARTPQI=y CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFSHCD_PCI=m diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64 index acd46d7b168..780f2c86aed 100644 --- a/SPECS/kernel/config_aarch64 +++ b/SPECS/kernel/config_aarch64 @@ -2726,7 +2726,7 @@ CONFIG_SCSI_MPT3SAS=y CONFIG_SCSI_MPT2SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_MAX_SGE=128 CONFIG_SCSI_MPT2SAS=y -# CONFIG_SCSI_MPI3MR is not set +CONFIG_SCSI_MPI3MR=m # CONFIG_SCSI_SMARTPQI is not set CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFSHCD_PCI=m diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index 01a0796b700..bc5469a3e86 100644 --- a/SPECS/kernel/kernel.signatures.json +++ b/SPECS/kernel/kernel.signatures.json @@ -1,9 +1,9 @@ { "Signatures": { "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", - "config": "32361dee210fc2894f564975951f7c424d7fcea012232e2a059a9254746da134", - "config_aarch64": "1bdd3093e94d089985dd3af1ede1905c9d4e8237aa46728e489c5b94edaddf2d", + "config": "8719cdd86f6c65828021b13ec41c54ecdacb59ebc6e6f8033622c6ee9b45d94f", + "config_aarch64": "b2f8ca0a288480bce99e327bd0b4bf88095a05a8fabd9929f83c954127086396", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", "kernel-5.15.148.2.tar.gz": "58488cf131b8a1c77dcac651fbad10e105e9a8d2f48b7bb8b2d08ac63483a129" } -} \ No newline at end of file +} diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 6c9fdc0f76d..6e19f1d07ec 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -28,7 +28,7 @@ Summary: Linux Kernel Name: kernel Version: 5.15.148.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -426,6 +426,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Wed Feb 14 2024 Rachel Menge - 5.15.148.2-2 +- Enable Broadcom MPI3 Storage Controller Device Driver + * Thu Feb 08 2024 CBL-Mariner Servicing Account - 5.15.148.2-1 - Auto-upgrade to 5.15.148.2 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 7588173d187..db04e571819 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,5 +1,5 @@ filesystem-1.1-20.cm2.aarch64.rpm -kernel-headers-5.15.148.2-1.cm2.noarch.rpm +kernel-headers-5.15.148.2-2.cm2.noarch.rpm glibc-2.35-6.cm2.aarch64.rpm glibc-devel-2.35-6.cm2.aarch64.rpm glibc-i18n-2.35-6.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 18daf856ccc..c61dc789d9a 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,5 +1,5 @@ filesystem-1.1-20.cm2.x86_64.rpm -kernel-headers-5.15.148.2-1.cm2.noarch.rpm +kernel-headers-5.15.148.2-2.cm2.noarch.rpm glibc-2.35-6.cm2.x86_64.rpm glibc-devel-2.35-6.cm2.x86_64.rpm glibc-i18n-2.35-6.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index ddf4f640be6..5e394dec841 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -136,7 +136,7 @@ intltool-0.51.0-7.cm2.noarch.rpm itstool-2.0.6-4.cm2.noarch.rpm kbd-2.2.0-1.cm2.aarch64.rpm kbd-debuginfo-2.2.0-1.cm2.aarch64.rpm -kernel-headers-5.15.148.2-1.cm2.noarch.rpm +kernel-headers-5.15.148.2-2.cm2.noarch.rpm kmod-29-2.cm2.aarch64.rpm kmod-debuginfo-29-2.cm2.aarch64.rpm kmod-devel-29-2.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index a4cf0622663..9e52a9c609f 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -141,8 +141,8 @@ intltool-0.51.0-7.cm2.noarch.rpm itstool-2.0.6-4.cm2.noarch.rpm kbd-2.2.0-1.cm2.x86_64.rpm kbd-debuginfo-2.2.0-1.cm2.x86_64.rpm -kernel-cross-headers-5.15.148.2-1.cm2.noarch.rpm -kernel-headers-5.15.148.2-1.cm2.noarch.rpm +kernel-cross-headers-5.15.148.2-2.cm2.noarch.rpm +kernel-headers-5.15.148.2-2.cm2.noarch.rpm kmod-29-2.cm2.x86_64.rpm kmod-debuginfo-29-2.cm2.x86_64.rpm kmod-devel-29-2.cm2.x86_64.rpm diff --git a/toolkit/scripts/mariner-required-configs.json b/toolkit/scripts/mariner-required-configs.json index 87c7f7b480d..435ae8ce57d 100644 --- a/toolkit/scripts/mariner-required-configs.json +++ b/toolkit/scripts/mariner-required-configs.json @@ -1360,6 +1360,19 @@ "PR": [ "https://github.com/microsoft/CBL-Mariner/pull/7181" ] + }, + "CONFIG_SCSI_MPI3MR": { + "value": [ + "m" + ], + "arch": [ + "AMD64", + "ARM64" + ], + "comment": "Needed for customer", + "PR": [ + "https://github.com/microsoft/CBL-Mariner/pull/7897" + ] } } }