From e94787c454abc5268744719ba1a73601c77a2463 Mon Sep 17 00:00:00 2001 From: CBL-Mariner-Bot <75509084+CBL-Mariner-Bot@users.noreply.github.com> Date: Mon, 11 Sep 2023 10:47:11 -0700 Subject: [PATCH] [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 --- .../kernel-azure-signed.spec | 5 ++++- .../kernel-hci-signed/kernel-hci-signed.spec | 5 ++++- SPECS-SIGNED/kernel-signed/kernel-signed.spec | 5 ++++- .../hyperv-daemons.signatures.json | 2 +- SPECS/hyperv-daemons/hyperv-daemons.spec | 5 ++++- SPECS/kernel-azure/config | 9 ++++++-- SPECS/kernel-azure/config_aarch64 | 2 +- .../kernel-azure/kernel-azure.signatures.json | 6 ++--- SPECS/kernel-azure/kernel-azure.spec | 5 ++++- SPECS/kernel-hci/config | 9 ++++++-- SPECS/kernel-hci/kernel-hci.signatures.json | 4 ++-- SPECS/kernel-hci/kernel-hci.spec | 5 ++++- .../kernel-headers.signatures.json | 2 +- SPECS/kernel-headers/kernel-headers.spec | 5 ++++- SPECS/kernel/config | 9 ++++++-- SPECS/kernel/config_aarch64 | 2 +- SPECS/kernel/kernel.signatures.json | 6 ++--- SPECS/kernel/kernel.spec | 5 ++++- cgmanifest.json | 22 +++++++++---------- .../manifests/package/pkggen_core_aarch64.txt | 2 +- .../manifests/package/pkggen_core_x86_64.txt | 2 +- .../manifests/package/toolchain_aarch64.txt | 2 +- .../manifests/package/toolchain_x86_64.txt | 2 +- toolkit/scripts/mariner-required-configs.json | 16 ++++++++++++++ 24 files changed, 96 insertions(+), 41 deletions(-) diff --git a/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec b/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec index 43d2bc5102..43c0a3bd9d 100644 --- a/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec +++ b/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec @@ -9,7 +9,7 @@ %define uname_r %{version}-%{release} Summary: Signed Linux Kernel for Azure Name: kernel-azure-signed-%{buildarch} -Version: 5.15.126.1 +Version: 5.15.131.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog +* Fri Sep 08 2023 CBL-Mariner Servicing Account - 5.15.131.1-1 +- Auto-upgrade to 5.15.131.1 + * Mon Aug 14 2023 CBL-Mariner Servicing Account - 5.15.126.1-1 - Auto-upgrade to 5.15.126.1 diff --git a/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec b/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec index eb0bfecd0e..1ca230cd2b 100644 --- a/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec +++ b/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec @@ -4,7 +4,7 @@ %define uname_r %{version}-%{release} Summary: Signed Linux Kernel for HCI Name: kernel-hci-signed-%{buildarch} -Version: 5.15.126.1 +Version: 5.15.131.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -149,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog +* Fri Sep 08 2023 CBL-Mariner Servicing Account - 5.15.131.1-1 +- Auto-upgrade to 5.15.131.1 + * Mon Aug 14 2023 CBL-Mariner Servicing Account - 5.15.126.1-1 - Auto-upgrade to 5.15.126.1 diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 9c206116d0..b36506093c 100644 --- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec +++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec @@ -9,7 +9,7 @@ %define uname_r %{version}-%{release} Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-signed-%{buildarch} -Version: 5.15.126.1 +Version: 5.15.131.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog +* Fri Sep 08 2023 CBL-Mariner Servicing Account - 5.15.131.1-1 +- Auto-upgrade to 5.15.131.1 + * Mon Aug 14 2023 CBL-Mariner Servicing Account - 5.15.126.1-1 - Auto-upgrade to 5.15.126.1 diff --git a/SPECS/hyperv-daemons/hyperv-daemons.signatures.json b/SPECS/hyperv-daemons/hyperv-daemons.signatures.json index 3e3e84e805..3f75e95ef1 100644 --- a/SPECS/hyperv-daemons/hyperv-daemons.signatures.json +++ b/SPECS/hyperv-daemons/hyperv-daemons.signatures.json @@ -7,6 +7,6 @@ "hypervkvpd.service": "c1bb207cf9f388f8f3cf5b649abbf8cfe4c4fcf74538612946e68f350d1f265f", "hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1", "hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d", - "kernel-5.15.126.1.tar.gz": "75126c16505cbc264f194c963851f5021f807fc82a0e594779ce83be83d45fe6" + "kernel-5.15.131.1.tar.gz": "79e6f96e5e9b0e920336dc5c2da0d5b65c3d77f9568b15ae6c4517164aace0a4" } } \ No newline at end of file diff --git a/SPECS/hyperv-daemons/hyperv-daemons.spec b/SPECS/hyperv-daemons/hyperv-daemons.spec index 6800319472..3834e37861 100644 --- a/SPECS/hyperv-daemons/hyperv-daemons.spec +++ b/SPECS/hyperv-daemons/hyperv-daemons.spec @@ -8,7 +8,7 @@ %global udev_prefix 70 Summary: Hyper-V daemons suite Name: hyperv-daemons -Version: 5.15.126.1 +Version: 5.15.131.1 Release: 1%{?dist} License: GPLv2+ Vendor: Microsoft Corporation @@ -219,6 +219,9 @@ fi %{_sbindir}/lsvmbus %changelog +* Fri Sep 08 2023 CBL-Mariner Servicing Account - 5.15.131.1-1 +- Auto-upgrade to 5.15.131.1 + * Mon Aug 14 2023 CBL-Mariner Servicing Account - 5.15.126.1-1 - Auto-upgrade to 5.15.126.1 diff --git a/SPECS/kernel-azure/config b/SPECS/kernel-azure/config index d63435213f..51458063a0 100644 --- a/SPECS/kernel-azure/config +++ b/SPECS/kernel-azure/config @@ -1,6 +1,6 @@ # # 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_IS_GCC=y @@ -6044,12 +6044,17 @@ CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m # CONFIG_MAX9611 is not set # CONFIG_MCP3422 is not set # CONFIG_NAU7802 is not set -# CONFIG_STX104 is not set # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADS1015 is not set # CONFIG_XILINX_XADC is not set # 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 # diff --git a/SPECS/kernel-azure/config_aarch64 b/SPECS/kernel-azure/config_aarch64 index 1c4b672303..812ec8c8d0 100644 --- a/SPECS/kernel-azure/config_aarch64 +++ b/SPECS/kernel-azure/config_aarch64 @@ -1,6 +1,6 @@ # # 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_IS_GCC=y diff --git a/SPECS/kernel-azure/kernel-azure.signatures.json b/SPECS/kernel-azure/kernel-azure.signatures.json index 142687309e..f7c8175205 100644 --- a/SPECS/kernel-azure/kernel-azure.signatures.json +++ b/SPECS/kernel-azure/kernel-azure.signatures.json @@ -1,9 +1,9 @@ { "Signatures": { "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", - "config": "8bd7debefe550885281463e13faf8c1bd0c572977e83671b8f1ff479ecdb32b0", - "config_aarch64": "edc4c02b1c3b7027d7546954fec53c25c3c197e87a6609385fa2ea926cf28345", + "config": "a50ff4269a0f7470cc14896fdb429daa8b5143e8e66e005f95f3bb4f8d91fc84", + "config_aarch64": "ff20c123409e3486e8de87cd2fb6db4b1b2cd02aca88f53c5359f55bb1df528b", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", - "kernel-5.15.126.1.tar.gz": "75126c16505cbc264f194c963851f5021f807fc82a0e594779ce83be83d45fe6" + "kernel-5.15.131.1.tar.gz": "79e6f96e5e9b0e920336dc5c2da0d5b65c3d77f9568b15ae6c4517164aace0a4" } } \ No newline at end of file diff --git a/SPECS/kernel-azure/kernel-azure.spec b/SPECS/kernel-azure/kernel-azure.spec index 22fc45fb0d..5c5d5f3840 100644 --- a/SPECS/kernel-azure/kernel-azure.spec +++ b/SPECS/kernel-azure/kernel-azure.spec @@ -27,7 +27,7 @@ Summary: Linux Kernel Name: kernel-azure -Version: 5.15.126.1 +Version: 5.15.131.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -416,6 +416,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Fri Sep 08 2023 CBL-Mariner Servicing Account - 5.15.131.1-1 +- Auto-upgrade to 5.15.131.1 + * Mon Aug 14 2023 CBL-Mariner Servicing Account - 5.15.126.1-1 - Auto-upgrade to 5.15.126.1 diff --git a/SPECS/kernel-hci/config b/SPECS/kernel-hci/config index fe8d67ef57..5d5e64fd6e 100644 --- a/SPECS/kernel-hci/config +++ b/SPECS/kernel-hci/config @@ -1,6 +1,6 @@ # # 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_IS_GCC=y @@ -6033,12 +6033,17 @@ CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m # CONFIG_MAX9611 is not set # CONFIG_MCP3422 is not set # CONFIG_NAU7802 is not set -# CONFIG_STX104 is not set # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADS1015 is not set # CONFIG_XILINX_XADC is not set # 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 # diff --git a/SPECS/kernel-hci/kernel-hci.signatures.json b/SPECS/kernel-hci/kernel-hci.signatures.json index 656d5a90fb..9faaa2a3aa 100644 --- a/SPECS/kernel-hci/kernel-hci.signatures.json +++ b/SPECS/kernel-hci/kernel-hci.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", - "config": "de8133e52cc63f133661653a3f5e9576598d5171445b9150503e9dbe392a6d0a", - "kernel-5.15.126.1.tar.gz": "75126c16505cbc264f194c963851f5021f807fc82a0e594779ce83be83d45fe6" + "config": "015bd05f0b97edc9b61956d54dc1378833e3348f5aabd64f12ee81af0fa7c4e8", + "kernel-5.15.131.1.tar.gz": "79e6f96e5e9b0e920336dc5c2da0d5b65c3d77f9568b15ae6c4517164aace0a4" } } \ No newline at end of file diff --git a/SPECS/kernel-hci/kernel-hci.spec b/SPECS/kernel-hci/kernel-hci.spec index 1b97251958..2ec271ef84 100644 --- a/SPECS/kernel-hci/kernel-hci.spec +++ b/SPECS/kernel-hci/kernel-hci.spec @@ -17,7 +17,7 @@ %define config_source %{SOURCE1} Summary: Linux Kernel for HCI Name: kernel-hci -Version: 5.15.126.1 +Version: 5.15.131.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -431,6 +431,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Fri Sep 08 2023 CBL-Mariner Servicing Account - 5.15.131.1-1 +- Auto-upgrade to 5.15.131.1 + * Mon Aug 14 2023 CBL-Mariner Servicing Account - 5.15.126.1-1 - Auto-upgrade to 5.15.126.1 diff --git a/SPECS/kernel-headers/kernel-headers.signatures.json b/SPECS/kernel-headers/kernel-headers.signatures.json index da5d94f5d4..243206377b 100644 --- a/SPECS/kernel-headers/kernel-headers.signatures.json +++ b/SPECS/kernel-headers/kernel-headers.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "kernel-5.15.126.1.tar.gz": "75126c16505cbc264f194c963851f5021f807fc82a0e594779ce83be83d45fe6" + "kernel-5.15.131.1.tar.gz": "79e6f96e5e9b0e920336dc5c2da0d5b65c3d77f9568b15ae6c4517164aace0a4" } } \ No newline at end of file diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index 74e1a7aab7..f33ceb1571 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -1,6 +1,6 @@ Summary: Linux API header files Name: kernel-headers -Version: 5.15.126.1 +Version: 5.15.131.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -36,6 +36,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog +* Fri Sep 08 2023 CBL-Mariner Servicing Account - 5.15.131.1-1 +- Auto-upgrade to 5.15.131.1 + * Mon Aug 14 2023 CBL-Mariner Servicing Account - 5.15.126.1-1 - Auto-upgrade to 5.15.126.1 diff --git a/SPECS/kernel/config b/SPECS/kernel/config index d1aeacdaa2..fc6039acb6 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/config @@ -1,6 +1,6 @@ # # 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_IS_GCC=y @@ -6078,12 +6078,17 @@ CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m # CONFIG_MAX9611 is not set # CONFIG_MCP3422 is not set # CONFIG_NAU7802 is not set -# CONFIG_STX104 is not set # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADS1015 is not set # CONFIG_XILINX_XADC is not set # 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 # diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64 index e1d1ffe1cc..0ea762f140 100644 --- a/SPECS/kernel/config_aarch64 +++ b/SPECS/kernel/config_aarch64 @@ -1,6 +1,6 @@ # # 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_IS_GCC=y diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index 861dae3e30..516e13287d 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": "2ac24627a8ed324b087454ebd3e71733eacefb1169a730581257adc01c0a418a", - "config_aarch64": "5ea53994860e28735152cec6748cb038b24533be9ed3c0d92c48937b888528c5", + "config": "5aac865f894b53ebc1cd94dc6763ed8a5c07c0e2834e6a43fcc8a84fe0ce2c98", + "config_aarch64": "f060e00880f85bb8222dac3db4419659a522e54c36eff4b2f322ec81e847da85", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", - "kernel-5.15.126.1.tar.gz": "75126c16505cbc264f194c963851f5021f807fc82a0e594779ce83be83d45fe6" + "kernel-5.15.131.1.tar.gz": "79e6f96e5e9b0e920336dc5c2da0d5b65c3d77f9568b15ae6c4517164aace0a4" } } \ No newline at end of file diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 905b62dd94..51ae4bb85d 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -27,7 +27,7 @@ Summary: Linux Kernel Name: kernel -Version: 5.15.126.1 +Version: 5.15.131.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -422,6 +422,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Fri Sep 08 2023 CBL-Mariner Servicing Account - 5.15.131.1-1 +- Auto-upgrade to 5.15.131.1 + * Mon Aug 14 2023 CBL-Mariner Servicing Account - 5.15.126.1-1 - Auto-upgrade to 5.15.126.1 diff --git a/cgmanifest.json b/cgmanifest.json index 0b9e8fac82..34665cd3eb 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6570,8 +6570,8 @@ "type": "other", "other": { "name": "hyperv-daemons", - "version": "5.15.126.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.126.1.tar.gz" + "version": "5.15.131.1", + "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", "other": { "name": "kernel", - "version": "5.15.126.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.126.1.tar.gz" + "version": "5.15.131.1", + "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", "other": { "name": "kernel-azure", - "version": "5.15.126.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.126.1.tar.gz" + "version": "5.15.131.1", + "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", "other": { "name": "kernel-hci", - "version": "5.15.126.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.126.1.tar.gz" + "version": "5.15.131.1", + "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", "other": { "name": "kernel-headers", - "version": "5.15.126.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.126.1.tar.gz" + "version": "5.15.131.1", + "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 -} +} \ No newline at end of file diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 7692288254..b1cb22bd54 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-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-devel-2.35-4.cm2.aarch64.rpm glibc-i18n-2.35-4.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 1d1ef18dd8..27281ef09c 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-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-devel-2.35-4.cm2.x86_64.rpm glibc-i18n-2.35-4.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 60dbd57bf0..c970665f0c 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.126.1-1.cm2.noarch.rpm +kernel-headers-5.15.131.1-1.cm2.noarch.rpm kmod-29-1.cm2.aarch64.rpm kmod-debuginfo-29-1.cm2.aarch64.rpm kmod-devel-29-1.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 52f6f7346e..94b4cc616a 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.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.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-debuginfo-29-1.cm2.x86_64.rpm kmod-devel-29-1.cm2.x86_64.rpm diff --git a/toolkit/scripts/mariner-required-configs.json b/toolkit/scripts/mariner-required-configs.json index 20c7c35e08..8d2b1b96e7 100644 --- a/toolkit/scripts/mariner-required-configs.json +++ b/toolkit/scripts/mariner-required-configs.json @@ -1114,6 +1114,22 @@ "PR": [ "https://github.com/torvalds/linux/commit/b561275d633bcd8e0e8055ab86f1a13df75a0269" ] + }, + "CONFIG_STX104": { + "value": [ + "is not set", + "y", + "m", + "" + ], + "arch": [ + "AMD64", + "ARM64" + ], + "comment": "Needed for update to 5.15.131.1", + "PR": [ + "https://github.com/microsoft/CBL-Mariner/pull/6196" + ] } } }