folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Enable nvme multipath (#5418)" (#5504) 

This reverts commit 72bd8e8273.
This commit is contained in:
rlmenge 2023-05-15 15:21:14 -07:00 committed by GitHub
parent fa5aa23509
commit 723b736a7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SPECS-SIGNED/kernel-signed/kernel-signed.spec
View File

@ -10,7 +10,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch} Name: kernel-signed-%{buildarch}
Version: 5.15.110.1 Version: 5.15.110.1
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
Distribution: Mariner Distribution: Mariner
@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /module_info.ld %exclude /module_info.ld
%changelog %changelog
* Mon May 15 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.110.1-5
- Bump release to match kernel
* Tue May 09 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.110.1-4 * Tue May 09 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.110.1-4
- Bump release to match kernel - Bump release to match kernel

5
SPECS/kernel-headers/kernel-headers.spec
View File

@ -1,7 +1,7 @@
Summary: Linux API header files Summary: Linux API header files
Name: kernel-headers Name: kernel-headers
Version: 5.15.110.1 Version: 5.15.110.1
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
Distribution: Mariner Distribution: Mariner
@ -36,6 +36,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
%{_includedir}/* %{_includedir}/*
%changelog %changelog
* Mon May 15 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.110.1-5
- Bump release to match kernel
* Tue May 09 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.110.1-4 * Tue May 09 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.110.1-4
- Bump release to match kernel - Bump release to match kernel

2
SPECS/kernel/config
View File

@ -2019,7 +2019,7 @@ CONFIG_BLK_DEV_RBD=m
# #
CONFIG_NVME_CORE=y CONFIG_NVME_CORE=y
CONFIG_BLK_DEV_NVME=y CONFIG_BLK_DEV_NVME=y
CONFIG_NVME_MULTIPATH=y # CONFIG_NVME_MULTIPATH is not set
# CONFIG_NVME_HWMON is not set # CONFIG_NVME_HWMON is not set
CONFIG_NVME_FABRICS=m CONFIG_NVME_FABRICS=m
CONFIG_NVME_RDMA=m CONFIG_NVME_RDMA=m

2
SPECS/kernel/config_aarch64
View File

@ -2572,7 +2572,7 @@ CONFIG_BLK_DEV_RBD=m
# #
CONFIG_NVME_CORE=y CONFIG_NVME_CORE=y
CONFIG_BLK_DEV_NVME=y CONFIG_BLK_DEV_NVME=y
CONFIG_NVME_MULTIPATH=y # CONFIG_NVME_MULTIPATH is not set
# CONFIG_NVME_HWMON is not set # CONFIG_NVME_HWMON is not set
CONFIG_NVME_FABRICS=m CONFIG_NVME_FABRICS=m
CONFIG_NVME_RDMA=m CONFIG_NVME_RDMA=m

4
SPECS/kernel/kernel.signatures.json
View File

@ -1,8 +1,8 @@
{ {
"Signatures": { "Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "1ced94f018c1925b4de1013297925b7c7e5236547c60e7a153dc031ad26382bb", "config": "389aec38c66d1009c668d8e329bd24d5e3d5d602ddf1185ab5b41b7b19443bec",
"config_aarch64": "383e92c4ec05af052bca211ce9cb25845b025590fdaed78477ea96022f5a1288", "config_aarch64": "1ac729706e84f13e3d94678bae9fa71e3bc0d9152fe87e979bef5c1bcee3c3b9",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
"kernel-5.15.110.1.tar.gz": "c350b56f7cb0ab04ce44bd7701d68a2ec7a4466004f4065027271ef091a64516" "kernel-5.15.110.1.tar.gz": "c350b56f7cb0ab04ce44bd7701d68a2ec7a4466004f4065027271ef091a64516"
} }

5
SPECS/kernel/kernel.spec
View File

@ -28,7 +28,7 @@
Summary: Linux Kernel Summary: Linux Kernel
Name: kernel Name: kernel
Version: 5.15.110.1 Version: 5.15.110.1
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
Distribution: Mariner Distribution: Mariner
@ -420,6 +420,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool %{_sysconfdir}/bash_completion.d/bpftool
%changelog %changelog
* Mon May 15 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.110.1-5
- Revert CONFIG_NVME_MULTIPATH
* Tue May 09 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.110.1-4 * Tue May 09 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.110.1-4
- Enable CONFIG_EDAC_SKX - Enable CONFIG_EDAC_SKX

2
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View File

@ -1,5 +1,5 @@
filesystem-1.1-12.cm2.aarch64.rpm filesystem-1.1-12.cm2.aarch64.rpm
kernel-headers-5.15.110.1-4.cm2.noarch.rpm kernel-headers-5.15.110.1-5.cm2.noarch.rpm
glibc-2.35-3.cm2.aarch64.rpm glibc-2.35-3.cm2.aarch64.rpm
glibc-devel-2.35-3.cm2.aarch64.rpm glibc-devel-2.35-3.cm2.aarch64.rpm
glibc-i18n-2.35-3.cm2.aarch64.rpm glibc-i18n-2.35-3.cm2.aarch64.rpm

2
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View File

@ -1,5 +1,5 @@
filesystem-1.1-12.cm2.x86_64.rpm filesystem-1.1-12.cm2.x86_64.rpm
kernel-headers-5.15.110.1-4.cm2.noarch.rpm kernel-headers-5.15.110.1-5.cm2.noarch.rpm
glibc-2.35-3.cm2.x86_64.rpm glibc-2.35-3.cm2.x86_64.rpm
glibc-devel-2.35-3.cm2.x86_64.rpm glibc-devel-2.35-3.cm2.x86_64.rpm
glibc-i18n-2.35-3.cm2.x86_64.rpm glibc-i18n-2.35-3.cm2.x86_64.rpm

2
toolkit/resources/manifests/package/toolchain_aarch64.txt
View File

@ -135,7 +135,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.aarch64.rpm kbd-2.2.0-1.cm2.aarch64.rpm
kbd-debuginfo-2.2.0-1.cm2.aarch64.rpm kbd-debuginfo-2.2.0-1.cm2.aarch64.rpm
kernel-headers-5.15.110.1-4.cm2.noarch.rpm kernel-headers-5.15.110.1-5.cm2.noarch.rpm
kmod-29-1.cm2.aarch64.rpm kmod-29-1.cm2.aarch64.rpm
kmod-debuginfo-29-1.cm2.aarch64.rpm kmod-debuginfo-29-1.cm2.aarch64.rpm
kmod-devel-29-1.cm2.aarch64.rpm kmod-devel-29-1.cm2.aarch64.rpm

2
toolkit/resources/manifests/package/toolchain_x86_64.txt
View File

@ -135,7 +135,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.x86_64.rpm kbd-2.2.0-1.cm2.x86_64.rpm
kbd-debuginfo-2.2.0-1.cm2.x86_64.rpm kbd-debuginfo-2.2.0-1.cm2.x86_64.rpm
kernel-headers-5.15.110.1-4.cm2.noarch.rpm kernel-headers-5.15.110.1-5.cm2.noarch.rpm
kmod-29-1.cm2.x86_64.rpm kmod-29-1.cm2.x86_64.rpm
kmod-debuginfo-29-1.cm2.x86_64.rpm kmod-debuginfo-29-1.cm2.x86_64.rpm
kmod-devel-29-1.cm2.x86_64.rpm kmod-devel-29-1.cm2.x86_64.rpm