From 85b357baee7c5214b4c53e8a5aff68598cc571fe Mon Sep 17 00:00:00 2001 From: Jon Slobodzian Date: Thu, 11 Jan 2024 05:30:41 -0800 Subject: [PATCH] Revert "Upgrade kernel-mos to 5.15.143.1 (#7086)" This reverts commit 5324a3a344e9becce597533573a02fe1baabaf36. --- SPECS-SIGNED/kernel-mos-signed/kernel-mos-signed.spec | 5 +---- SPECS/kernel-mos/config | 2 +- SPECS/kernel-mos/kernel-mos.signatures.json | 4 ++-- SPECS/kernel-mos/kernel-mos.spec | 5 +---- cgmanifest.json | 4 ++-- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/SPECS-SIGNED/kernel-mos-signed/kernel-mos-signed.spec b/SPECS-SIGNED/kernel-mos-signed/kernel-mos-signed.spec index 05301732860..d5f0f62a39f 100644 --- a/SPECS-SIGNED/kernel-mos-signed/kernel-mos-signed.spec +++ b/SPECS-SIGNED/kernel-mos-signed/kernel-mos-signed.spec @@ -4,7 +4,7 @@ %define uname_r %{version}-%{release} Summary: Signed Linux Kernel for MOS systems Name: kernel-mos-signed-%{buildarch} -Version: 5.15.143.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -150,9 +150,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog -* Wed Dec 20 2023 Gary Swalling - 5.15.143.1-1 -- Update to 5.15.143.1 - * Mon Dec 11 2023 Rachel Menge - 5.15.139.1-1 - Update to 5.15.139.1 diff --git a/SPECS/kernel-mos/config b/SPECS/kernel-mos/config index 841f5206387..0c864e66f65 100644 --- a/SPECS/kernel-mos/config +++ b/SPECS/kernel-mos/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.15.143.1 Kernel Configuration +# Linux/x86_64 5.15.139.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/SPECS/kernel-mos/kernel-mos.signatures.json b/SPECS/kernel-mos/kernel-mos.signatures.json index e4b8f333bb1..0c8c8589654 100644 --- a/SPECS/kernel-mos/kernel-mos.signatures.json +++ b/SPECS/kernel-mos/kernel-mos.signatures.json @@ -1,8 +1,8 @@ { "Signatures": { "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", - "config": "31d715c94442a6919cfb4e953ed018c74ab2decb98e756803d719d1a9bafd1e4", + "config": "b9a7956035823d6b9440a42677699be3abfd15dd562df6aa2582806399b82b27", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", - "kernel-mos-5.15.143.1.tar.gz": "db64de6cf1d81ba0b7c42abace102b0514ea8a2bf1a32040733bf4ce89d2a124" + "kernel-mos-5.15.139.1.tar.gz": "3f0bcbee6b6c5411790e822562ac46448001559aa55950dc2f8ca7a9547a1d1f" } } diff --git a/SPECS/kernel-mos/kernel-mos.spec b/SPECS/kernel-mos/kernel-mos.spec index f355b23089d..e260ebce91b 100644 --- a/SPECS/kernel-mos/kernel-mos.spec +++ b/SPECS/kernel-mos/kernel-mos.spec @@ -18,7 +18,7 @@ %define config_source %{SOURCE1} Summary: Linux Kernel for MOS Name: kernel-mos -Version: 5.15.143.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -377,9 +377,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog -* Wed Dec 20 2023 Gary Swalling - 5.15.143.1-1 -- Update to 5.15.143.1 - * Mon Dec 11 2023 Rachel Menge - 5.15.139.1-1 - Update to 5.15.139.1 diff --git a/cgmanifest.json b/cgmanifest.json index 74c436b5a1a..ef64c7de257 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -8161,8 +8161,8 @@ "type": "other", "other": { "name": "kernel-mos", - "version": "5.15.143.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2-mos/5.15.143.1.tar.gz" + "version": "5.15.139.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2-mos/5.15.139.1.tar.gz" } } },