diff --git a/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec b/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec index 4787b7b70da..e96b7529c47 100644 --- a/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec +++ b/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec @@ -10,7 +10,7 @@ Summary: Signed Linux Kernel for Azure Name: kernel-azure-signed-%{buildarch} Version: 5.15.137.1 -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 +* Mon Nov 20 2023 Rachel Menge - 5.15.137.1-2 +- Bump release to match kernel + * Mon Nov 06 2023 CBL-Mariner Servicing Account - 5.15.137.1-1 - Auto-upgrade to 5.15.137.1 diff --git a/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec b/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec index d49870a5133..f161c378d5d 100644 --- a/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec +++ b/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec @@ -5,7 +5,7 @@ Summary: Signed Linux Kernel for HCI Name: kernel-hci-signed-%{buildarch} Version: 5.15.137.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -149,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog +* Mon Nov 20 2023 Rachel Menge - 5.15.137.1-2 +- Bump release to match kernel + * Mon Nov 06 2023 CBL-Mariner Servicing Account - 5.15.137.1-1 - Auto-upgrade to 5.15.137.1 diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 6ac1dda85b5..bf9f916dc53 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.137.1 -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 +* Mon Nov 20 2023 Rachel Menge - 5.15.137.1-2 +- Bump release to match kernel + * Mon Nov 06 2023 CBL-Mariner Servicing Account - 5.15.137.1-1 - Auto-upgrade to 5.15.137.1 diff --git a/SPECS/kernel-azure/kernel-azure.spec b/SPECS/kernel-azure/kernel-azure.spec index 29d04d0badb..531edb3bc2f 100644 --- a/SPECS/kernel-azure/kernel-azure.spec +++ b/SPECS/kernel-azure/kernel-azure.spec @@ -28,7 +28,7 @@ Summary: Linux Kernel Name: kernel-azure Version: 5.15.137.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -42,6 +42,7 @@ Source4: cbl-mariner-ca-20211013.pem BuildRequires: audit-devel BuildRequires: bash BuildRequires: bc +BuildRequires: cpio BuildRequires: diffutils BuildRequires: dwarves BuildRequires: elfutils-libelf-devel @@ -419,6 +420,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Mon Nov 20 2023 Rachel Menge - 5.15.137.1-2 +- Add missing BuildRequires cpio + * Mon Nov 06 2023 CBL-Mariner Servicing Account - 5.15.137.1-1 - Auto-upgrade to 5.15.137.1 diff --git a/SPECS/kernel-hci/kernel-hci.spec b/SPECS/kernel-hci/kernel-hci.spec index faffb982aa7..2e458d35003 100644 --- a/SPECS/kernel-hci/kernel-hci.spec +++ b/SPECS/kernel-hci/kernel-hci.spec @@ -18,7 +18,7 @@ Summary: Linux Kernel for HCI Name: kernel-hci Version: 5.15.137.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -58,6 +58,7 @@ Patch27: 0028-net-mlx5-Bridge-use-debug-not-warn-if-entry-not-found.patch BuildRequires: audit-devel BuildRequires: bash BuildRequires: bc +BuildRequires: cpio BuildRequires: diffutils BuildRequires: dwarves BuildRequires: elfutils-libelf-devel @@ -434,6 +435,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Mon Nov 20 2023 Rachel Menge - 5.15.137.1-2 +- Add missing BuildRequires cpio + * Mon Nov 06 2023 CBL-Mariner Servicing Account - 5.15.137.1-1 - Auto-upgrade to 5.15.137.1 diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index a4c3a7c7518..13351b20f24 100644 --- a/SPECS/kernel-headers/kernel-headers.spec +++ b/SPECS/kernel-headers/kernel-headers.spec @@ -1,7 +1,7 @@ Summary: Linux API header files Name: kernel-headers Version: 5.15.137.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -36,6 +36,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog +* Mon Nov 20 2023 Rachel Menge - 5.15.137.1-2 +- Bump release to match kernel + * Mon Nov 06 2023 CBL-Mariner Servicing Account - 5.15.137.1-1 - Auto-upgrade to 5.15.137.1 diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index abbd2d02f43..a0fb594653c 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -28,7 +28,7 @@ Summary: Linux Kernel Name: kernel Version: 5.15.137.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -44,6 +44,7 @@ BuildRequires: audit-devel BuildRequires: bash BuildRequires: bc BuildRequires: build-essential +BuildRequires: cpio BuildRequires: diffutils BuildRequires: dwarves BuildRequires: elfutils-libelf-devel @@ -425,6 +426,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Mon Nov 20 2023 Rachel Menge - 5.15.137.1-2 +- Add missing BuildRequires cpio + * Mon Nov 06 2023 CBL-Mariner Servicing Account - 5.15.137.1-1 - Auto-upgrade to 5.15.137.1 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index a93a72b35a6..12a5d40a768 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-17.cm2.aarch64.rpm -kernel-headers-5.15.137.1-1.cm2.noarch.rpm +kernel-headers-5.15.137.1-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 96bec364e1e..08652291cf7 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-17.cm2.x86_64.rpm -kernel-headers-5.15.137.1-1.cm2.noarch.rpm +kernel-headers-5.15.137.1-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 fe0139a962e..c36fdba6590 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.137.1-1.cm2.noarch.rpm +kernel-headers-5.15.137.1-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 cc1a8033302..8b8ccae1222 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.137.1-1.cm2.noarch.rpm +kernel-headers-5.15.137.1-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