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

[AUTOPATCHER-kernel] Kernel upgrade to version 5.15.131.1 - branch main (#6196) 

* Kernel upgrade to 5.15.131.1 version

* Update configs

* Update mariner-required-configs

---------

Co-authored-by: Rachel Menge <rachelmenge@microsoft.com>
This commit is contained in:
CBL-Mariner-Bot 2023-09-11 10:47:11 -07:00 committed by GitHub
parent f2229b253d
commit e94787c454
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 96 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
%define uname_r %{version}-%{release} %define uname_r %{version}-%{release}
Summary: Signed Linux Kernel for Azure Summary: Signed Linux Kernel for Azure
Name: kernel-azure-signed-%{buildarch} Name: kernel-azure-signed-%{buildarch}
Version: 5.15.126.1 Version: 5.15.131.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /module_info.ld %exclude /module_info.ld
%changelog %changelog
* Fri Sep 08 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.131.1-1
- Auto-upgrade to 5.15.131.1
* Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1 * Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1
- Auto-upgrade to 5.15.126.1 - Auto-upgrade to 5.15.126.1

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

@ -4,7 +4,7 @@
%define uname_r %{version}-%{release} %define uname_r %{version}-%{release}
Summary: Signed Linux Kernel for HCI Summary: Signed Linux Kernel for HCI
Name: kernel-hci-signed-%{buildarch} Name: kernel-hci-signed-%{buildarch}
Version: 5.15.126.1 Version: 5.15.131.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
@ -149,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /module_info.ld %exclude /module_info.ld
%changelog %changelog
* Fri Sep 08 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.131.1-1
- Auto-upgrade to 5.15.131.1
* Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1 * Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1
- Auto-upgrade to 5.15.126.1 - Auto-upgrade to 5.15.126.1

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

@ -9,7 +9,7 @@
%define uname_r %{version}-%{release} %define uname_r %{version}-%{release}
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.126.1 Version: 5.15.131.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /module_info.ld %exclude /module_info.ld
%changelog %changelog
* Fri Sep 08 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.131.1-1
- Auto-upgrade to 5.15.131.1
* Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1 * Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1
- Auto-upgrade to 5.15.126.1 - Auto-upgrade to 5.15.126.1

2
SPECS/hyperv-daemons/hyperv-daemons.signatures.json
View File

@ -7,6 +7,6 @@
"hypervkvpd.service": "c1bb207cf9f388f8f3cf5b649abbf8cfe4c4fcf74538612946e68f350d1f265f", "hypervkvpd.service": "c1bb207cf9f388f8f3cf5b649abbf8cfe4c4fcf74538612946e68f350d1f265f",
"hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1", "hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1",
"hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d", "hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d",
"kernel-5.15.126.1.tar.gz": "75126c16505cbc264f194c963851f5021f807fc82a0e594779ce83be83d45fe6" "kernel-5.15.131.1.tar.gz": "79e6f96e5e9b0e920336dc5c2da0d5b65c3d77f9568b15ae6c4517164aace0a4"
} }
} }

5
SPECS/hyperv-daemons/hyperv-daemons.spec
View File

@ -8,7 +8,7 @@
%global udev_prefix 70 %global udev_prefix 70
Summary: Hyper-V daemons suite Summary: Hyper-V daemons suite
Name: hyperv-daemons Name: hyperv-daemons
Version: 5.15.126.1 Version: 5.15.131.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
@ -219,6 +219,9 @@ fi
%{_sbindir}/lsvmbus %{_sbindir}/lsvmbus
%changelog %changelog
* Fri Sep 08 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.131.1-1
- Auto-upgrade to 5.15.131.1
* Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1 * Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1
- Auto-upgrade to 5.15.126.1 - Auto-upgrade to 5.15.126.1

9
SPECS/kernel-azure/config
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.15.126.1 Kernel Configuration # Linux/x86_64 5.15.131.1 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -6044,12 +6044,17 @@ CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
# CONFIG_MAX9611 is not set # CONFIG_MAX9611 is not set
# CONFIG_MCP3422 is not set # CONFIG_MCP3422 is not set
# CONFIG_NAU7802 is not set # CONFIG_NAU7802 is not set
# CONFIG_STX104 is not set
# CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC081C is not set
# CONFIG_TI_ADS1015 is not set # CONFIG_TI_ADS1015 is not set
# CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XADC is not set
# end of Analog to digital converters # end of Analog to digital converters
#
# Analog to digital and digital to analog converters
#
# CONFIG_STX104 is not set
# end of Analog to digital and digital to analog converters
# #
# Analog Front Ends # Analog Front Ends
# #

2
SPECS/kernel-azure/config_aarch64
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.15.126.1 Kernel Configuration # Linux/arm64 5.15.131.1 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y

6
SPECS/kernel-azure/kernel-azure.signatures.json
View File

@ -1,9 +1,9 @@
{ {
"Signatures": { "Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "8bd7debefe550885281463e13faf8c1bd0c572977e83671b8f1ff479ecdb32b0", "config": "a50ff4269a0f7470cc14896fdb429daa8b5143e8e66e005f95f3bb4f8d91fc84",
"config_aarch64": "edc4c02b1c3b7027d7546954fec53c25c3c197e87a6609385fa2ea926cf28345", "config_aarch64": "ff20c123409e3486e8de87cd2fb6db4b1b2cd02aca88f53c5359f55bb1df528b",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
"kernel-5.15.126.1.tar.gz": "75126c16505cbc264f194c963851f5021f807fc82a0e594779ce83be83d45fe6" "kernel-5.15.131.1.tar.gz": "79e6f96e5e9b0e920336dc5c2da0d5b65c3d77f9568b15ae6c4517164aace0a4"
} }
} }

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

@ -27,7 +27,7 @@
Summary: Linux Kernel Summary: Linux Kernel
Name: kernel-azure Name: kernel-azure
Version: 5.15.126.1 Version: 5.15.131.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
@ -416,6 +416,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool %{_sysconfdir}/bash_completion.d/bpftool
%changelog %changelog
* Fri Sep 08 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.131.1-1
- Auto-upgrade to 5.15.131.1
* Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1 * Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1
- Auto-upgrade to 5.15.126.1 - Auto-upgrade to 5.15.126.1

9
SPECS/kernel-hci/config
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.15.126.1 Kernel Configuration # Linux/x86_64 5.15.131.1 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -6033,12 +6033,17 @@ CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
# CONFIG_MAX9611 is not set # CONFIG_MAX9611 is not set
# CONFIG_MCP3422 is not set # CONFIG_MCP3422 is not set
# CONFIG_NAU7802 is not set # CONFIG_NAU7802 is not set
# CONFIG_STX104 is not set
# CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC081C is not set
# CONFIG_TI_ADS1015 is not set # CONFIG_TI_ADS1015 is not set
# CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XADC is not set
# end of Analog to digital converters # end of Analog to digital converters
#
# Analog to digital and digital to analog converters
#
# CONFIG_STX104 is not set
# end of Analog to digital and digital to analog converters
# #
# Analog Front Ends # Analog Front Ends
# #

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

@ -1,7 +1,7 @@
{ {
"Signatures": { "Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "de8133e52cc63f133661653a3f5e9576598d5171445b9150503e9dbe392a6d0a", "config": "015bd05f0b97edc9b61956d54dc1378833e3348f5aabd64f12ee81af0fa7c4e8",
"kernel-5.15.126.1.tar.gz": "75126c16505cbc264f194c963851f5021f807fc82a0e594779ce83be83d45fe6" "kernel-5.15.131.1.tar.gz": "79e6f96e5e9b0e920336dc5c2da0d5b65c3d77f9568b15ae6c4517164aace0a4"
} }
} }

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

@ -17,7 +17,7 @@
%define config_source %{SOURCE1} %define config_source %{SOURCE1}
Summary: Linux Kernel for HCI Summary: Linux Kernel for HCI
Name: kernel-hci Name: kernel-hci
Version: 5.15.126.1 Version: 5.15.131.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
@ -431,6 +431,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool %{_sysconfdir}/bash_completion.d/bpftool
%changelog %changelog
* Fri Sep 08 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.131.1-1
- Auto-upgrade to 5.15.131.1
* Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1 * Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1
- Auto-upgrade to 5.15.126.1 - Auto-upgrade to 5.15.126.1

2
SPECS/kernel-headers/kernel-headers.signatures.json
View File

@ -1,5 +1,5 @@
{ {
"Signatures": { "Signatures": {
"kernel-5.15.126.1.tar.gz": "75126c16505cbc264f194c963851f5021f807fc82a0e594779ce83be83d45fe6" "kernel-5.15.131.1.tar.gz": "79e6f96e5e9b0e920336dc5c2da0d5b65c3d77f9568b15ae6c4517164aace0a4"
} }
} }

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

@ -1,6 +1,6 @@
Summary: Linux API header files Summary: Linux API header files
Name: kernel-headers Name: kernel-headers
Version: 5.15.126.1 Version: 5.15.131.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
@ -36,6 +36,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
%{_includedir}/* %{_includedir}/*
%changelog %changelog
* Fri Sep 08 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.131.1-1
- Auto-upgrade to 5.15.131.1
* Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1 * Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1
- Auto-upgrade to 5.15.126.1 - Auto-upgrade to 5.15.126.1

9
SPECS/kernel/config
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.15.126.1 Kernel Configuration # Linux/x86_64 5.15.131.1 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -6078,12 +6078,17 @@ CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
# CONFIG_MAX9611 is not set # CONFIG_MAX9611 is not set
# CONFIG_MCP3422 is not set # CONFIG_MCP3422 is not set
# CONFIG_NAU7802 is not set # CONFIG_NAU7802 is not set
# CONFIG_STX104 is not set
# CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC081C is not set
# CONFIG_TI_ADS1015 is not set # CONFIG_TI_ADS1015 is not set
# CONFIG_XILINX_XADC is not set # CONFIG_XILINX_XADC is not set
# end of Analog to digital converters # end of Analog to digital converters
#
# Analog to digital and digital to analog converters
#
# CONFIG_STX104 is not set
# end of Analog to digital and digital to analog converters
# #
# Analog Front Ends # Analog Front Ends
# #

2
SPECS/kernel/config_aarch64
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.15.126.1 Kernel Configuration # Linux/arm64 5.15.131.1 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y

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

@ -1,9 +1,9 @@
{ {
"Signatures": { "Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "2ac24627a8ed324b087454ebd3e71733eacefb1169a730581257adc01c0a418a", "config": "5aac865f894b53ebc1cd94dc6763ed8a5c07c0e2834e6a43fcc8a84fe0ce2c98",
"config_aarch64": "5ea53994860e28735152cec6748cb038b24533be9ed3c0d92c48937b888528c5", "config_aarch64": "f060e00880f85bb8222dac3db4419659a522e54c36eff4b2f322ec81e847da85",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
"kernel-5.15.126.1.tar.gz": "75126c16505cbc264f194c963851f5021f807fc82a0e594779ce83be83d45fe6" "kernel-5.15.131.1.tar.gz": "79e6f96e5e9b0e920336dc5c2da0d5b65c3d77f9568b15ae6c4517164aace0a4"
} }
} }

5
SPECS/kernel/kernel.spec
View File

@ -27,7 +27,7 @@
Summary: Linux Kernel Summary: Linux Kernel
Name: kernel Name: kernel
Version: 5.15.126.1 Version: 5.15.131.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
@ -422,6 +422,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool %{_sysconfdir}/bash_completion.d/bpftool
%changelog %changelog
* Fri Sep 08 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.131.1-1
- Auto-upgrade to 5.15.131.1
* Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1 * Mon Aug 14 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.126.1-1
- Auto-upgrade to 5.15.126.1 - Auto-upgrade to 5.15.126.1

22
cgmanifest.json
View File

@ -6570,8 +6570,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "hyperv-daemons", "name": "hyperv-daemons",
"version": "5.15.126.1", "version": "5.15.131.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.126.1.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.131.1.tar.gz"
} }
} }
}, },
@ -8151,8 +8151,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "kernel", "name": "kernel",
"version": "5.15.126.1", "version": "5.15.131.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.126.1.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.131.1.tar.gz"
} }
} }
}, },
@ -8161,8 +8161,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "kernel-azure", "name": "kernel-azure",
"version": "5.15.126.1", "version": "5.15.131.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.126.1.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.131.1.tar.gz"
} }
} }
}, },
@ -8171,8 +8171,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "kernel-hci", "name": "kernel-hci",
"version": "5.15.126.1", "version": "5.15.131.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.126.1.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.131.1.tar.gz"
} }
} }
}, },
@ -8181,8 +8181,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "kernel-headers", "name": "kernel-headers",
"version": "5.15.126.1", "version": "5.15.131.1",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.126.1.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.131.1.tar.gz"
} }
} }
}, },
@ -30827,4 +30827,4 @@
} }
], ],
"Version": 1 "Version": 1
} }

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

@ -1,5 +1,5 @@
filesystem-1.1-15.cm2.aarch64.rpm filesystem-1.1-15.cm2.aarch64.rpm
kernel-headers-5.15.126.1-1.cm2.noarch.rpm kernel-headers-5.15.131.1-1.cm2.noarch.rpm
glibc-2.35-4.cm2.aarch64.rpm glibc-2.35-4.cm2.aarch64.rpm
glibc-devel-2.35-4.cm2.aarch64.rpm glibc-devel-2.35-4.cm2.aarch64.rpm
glibc-i18n-2.35-4.cm2.aarch64.rpm glibc-i18n-2.35-4.cm2.aarch64.rpm

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

@ -1,5 +1,5 @@
filesystem-1.1-15.cm2.x86_64.rpm filesystem-1.1-15.cm2.x86_64.rpm
kernel-headers-5.15.126.1-1.cm2.noarch.rpm kernel-headers-5.15.131.1-1.cm2.noarch.rpm
glibc-2.35-4.cm2.x86_64.rpm glibc-2.35-4.cm2.x86_64.rpm
glibc-devel-2.35-4.cm2.x86_64.rpm glibc-devel-2.35-4.cm2.x86_64.rpm
glibc-i18n-2.35-4.cm2.x86_64.rpm glibc-i18n-2.35-4.cm2.x86_64.rpm

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

@ -136,7 +136,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.126.1-1.cm2.noarch.rpm kernel-headers-5.15.131.1-1.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

@ -136,7 +136,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.126.1-1.cm2.noarch.rpm kernel-headers-5.15.131.1-1.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

16
toolkit/scripts/mariner-required-configs.json
View File

@ -1114,6 +1114,22 @@
"PR": [ "PR": [
"https://github.com/torvalds/linux/commit/b561275d633bcd8e0e8055ab86f1a13df75a0269" "https://github.com/torvalds/linux/commit/b561275d633bcd8e0e8055ab86f1a13df75a0269"
] ]
},
"CONFIG_STX104": {
"value": [
"is not set",
"y",
"m",
"<missing>"
],
"arch": [
"AMD64",
"ARM64"
],
"comment": "Needed for update to 5.15.131.1",
"PR": [
"https://github.com/microsoft/CBL-Mariner/pull/6196"
]
} }
} }
} }