diff --git a/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec b/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec index bf3de4bc411..a8b76a875ff 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.143.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -153,9 +153,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec b/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec index de0838993ff..e405fc42237 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.143.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -149,9 +149,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec index 32718cb32d8..82e6079ebf7 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.143.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -153,9 +153,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %exclude /module_info.ld %changelog -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS/hyperv-daemons/hyperv-daemons.signatures.json b/SPECS/hyperv-daemons/hyperv-daemons.signatures.json index cdb013ca7e3..82115300493 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.143.1.tar.gz": "77b4a38b73d654f2e9388880aea8751c44a375b0fb66d11b26a2a9df0da4a609" + "kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" } -} \ No newline at end of file +} diff --git a/SPECS/hyperv-daemons/hyperv-daemons.spec b/SPECS/hyperv-daemons/hyperv-daemons.spec index b4284b71393..313d71193d2 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.143.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2+ Vendor: Microsoft Corporation @@ -219,9 +219,6 @@ fi %{_sbindir}/lsvmbus %changelog -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS/kernel-azure/config b/SPECS/kernel-azure/config index 8c69f1c1bbf..657beca69e3 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.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-azure/config_aarch64 b/SPECS/kernel-azure/config_aarch64 index bb5fb118a89..df1c4ceb037 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.143.1 Kernel Configuration +# Linux/arm64 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-azure/kernel-azure.signatures.json b/SPECS/kernel-azure/kernel-azure.signatures.json index fd0aa43b46e..2974e25c112 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": "45071dc4a9dd462158ce094505a59c5eae1848ac1ac929191d27e0fe3bc17bf6", - "config_aarch64": "0f72b3c9e63137680b665ff1df72dbd3c14438308ffc32d577443353b28b996c", + "config": "19c6638e60dd22da56be747f5f606fe4bc2adbe4b577ef5397e89f9d0c4ea87b", + "config_aarch64": "90e2887cacf5b35923a9a743225b6cc727adb19a3a7a174fa9dd7c2f4e78959a", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", - "kernel-5.15.143.1.tar.gz": "77b4a38b73d654f2e9388880aea8751c44a375b0fb66d11b26a2a9df0da4a609" + "kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" } -} \ No newline at end of file +} diff --git a/SPECS/kernel-azure/kernel-azure.spec b/SPECS/kernel-azure/kernel-azure.spec index f697f22c683..d09fa8e27dc 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.143.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -420,9 +420,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS/kernel-hci/0005-net-mlx5-Lag-move-lag-files-into-directory.patch b/SPECS/kernel-hci/0005-net-mlx5-Lag-move-lag-files-into-directory.patch index 8d01803537b..928d44a37e8 100644 --- a/SPECS/kernel-hci/0005-net-mlx5-Lag-move-lag-files-into-directory.patch +++ b/SPECS/kernel-hci/0005-net-mlx5-Lag-move-lag-files-into-directory.patch @@ -24,7 +24,7 @@ Signed-off-by: Saeed Mahameed rename drivers/net/ethernet/mellanox/mlx5/core/{lag_mp.h => lag/mp.h} (100%) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile -index 63032cd..bf2581b 100644 +index 63032cd6efb1..bf2581b43b1f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile +++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile @@ -14,7 +14,7 @@ obj-$(CONFIG_MLX5_CORE) += mlx5_core.o @@ -46,7 +46,7 @@ index 63032cd..bf2581b 100644 en/mapping.o mlx5_core-$(CONFIG_MLX5_CLS_ACT) += en_tc.o en/rep/tc.o en/rep/neigh.o \ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c -index 303e6e7..fd4d9fb 100644 +index cf03297c8471..26be4ed9564b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c @@ -11,8 +11,8 @@ @@ -61,7 +61,7 @@ index 303e6e7..fd4d9fb 100644 struct mlx5e_tc_tun_route_attr { struct net_device *out_dev; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c -index 78538a1..89a98ed 100644 +index 3aa8d0b83d10..8ca1db84ca21 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -67,8 +67,8 @@ @@ -74,12 +74,12 @@ index 78538a1..89a98ed 100644 +#include "lag/mp.h" #define nic_chains(priv) ((priv)->fs.tc.chains) - + #define MLX5_MH_ACT_SZ MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c similarity index 99% rename from drivers/net/ethernet/mellanox/mlx5/core/lag.c rename to drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c -index 5f8b7f3..fa8b7c7 100644 +index 57d86d47ec2a..ce41d766e417 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c @@ -38,7 +38,7 @@ @@ -95,7 +95,7 @@ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag.h b/drivers/net/etherne similarity index 98% rename from drivers/net/ethernet/mellanox/mlx5/core/lag.h rename to drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h -index d4bae52..c268663 100644 +index d4bae528954e..c268663c89b4 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h @@ -5,7 +5,7 @@ @@ -111,7 +111,7 @@ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c b/drivers/net/ethe similarity index 99% rename from drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c rename to drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c -index 81786a9..17967ed 100644 +index 81786a9a424c..17967ed405d8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c @@ -4,7 +4,7 @@ @@ -128,5 +128,5 @@ similarity index 100% rename from drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h rename to drivers/net/ethernet/mellanox/mlx5/core/lag/mp.h -- -2.34.1 +2.25.1 diff --git a/SPECS/kernel-hci/config b/SPECS/kernel-hci/config index 1cd9bb8844f..70eca3d3b5d 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.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-hci/kernel-hci.signatures.json b/SPECS/kernel-hci/kernel-hci.signatures.json index 00a54f480ea..7d3d3aef1f0 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": "f3af9078fa7196f45052e54331b686a4bb85043296c938bdc9485b895690f489", - "kernel-5.15.143.1.tar.gz": "77b4a38b73d654f2e9388880aea8751c44a375b0fb66d11b26a2a9df0da4a609" + "config": "b3dc3eafbbb4670e50adc73066644e2274c4801117f4e6109970c6dd45494e32", + "kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" } -} \ No newline at end of file +} diff --git a/SPECS/kernel-hci/kernel-hci.spec b/SPECS/kernel-hci/kernel-hci.spec index 6981a3cd25f..ad705737a04 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.143.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -435,10 +435,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 -- Fix 0005-net-mlx5-Lag-move-lag-files-into-directory.patch so patch applies after update - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS/kernel-headers/kernel-headers.signatures.json b/SPECS/kernel-headers/kernel-headers.signatures.json index 228776264fe..1bacab8db3f 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.143.1.tar.gz": "77b4a38b73d654f2e9388880aea8751c44a375b0fb66d11b26a2a9df0da4a609" + "kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" } -} \ No newline at end of file +} diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec index 06f36e214d2..82ef0cbe74c 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.143.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -36,9 +36,6 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/SPECS/kernel/CVE-2023-46862.nopatch b/SPECS/kernel/CVE-2023-46862.nopatch deleted file mode 100644 index a0b4ccecde7..00000000000 --- a/SPECS/kernel/CVE-2023-46862.nopatch +++ /dev/null @@ -1,3 +0,0 @@ -CVE-2023-46862 - patched in 5.15.140.1 - (generated by autopatch tool) -upstream 7644b1a1c9a7ae8ab99175989bfc8676055edb46 - stable 3d7912710e5e187217313fea5c145881cfeaf952 - diff --git a/SPECS/kernel/CVE-2023-6622.nopatch b/SPECS/kernel/CVE-2023-6622.nopatch deleted file mode 100644 index 81f06c20322..00000000000 --- a/SPECS/kernel/CVE-2023-6622.nopatch +++ /dev/null @@ -1,3 +0,0 @@ -CVE-2023-6622 - patched in 5.15.143.1 - (generated by autopatch tool) -upstream 3701cd390fd731ee7ae8b8006246c8db82c72bea - stable cf5f113c41eb2c7dbe19d849a0883f7a429fa54b - diff --git a/SPECS/kernel/CVE-2023-6931.nopatch b/SPECS/kernel/CVE-2023-6931.nopatch deleted file mode 100644 index 26ab12fcd4c..00000000000 --- a/SPECS/kernel/CVE-2023-6931.nopatch +++ /dev/null @@ -1,2 +0,0 @@ -CVE-2023-6931 - patched in 5.15.143.1 -upstream commit ID 382c27f4ed28f803b1f1473ac2d8db0afc795a1b -> stable commit ID ebc7597ce9719d2ff72e13df072680aa491f27fb diff --git a/SPECS/kernel/CVE-2023-6932.nopatch b/SPECS/kernel/CVE-2023-6932.nopatch deleted file mode 100644 index 47b66704bb9..00000000000 --- a/SPECS/kernel/CVE-2023-6932.nopatch +++ /dev/null @@ -1,3 +0,0 @@ -CVE-2023-6932 - patched in 5.15.142.1 - (generated by autopatch tool) -upstream e2b706c691905fe78468c361aaabc719d0a496f1 - stable c4a00c47a140c39a0497a40b0f54cf4586a2b1d7 - diff --git a/SPECS/kernel/config b/SPECS/kernel/config index b9d74ca0332..8dcfe12a075 100644 --- a/SPECS/kernel/config +++ b/SPECS/kernel/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/config_aarch64 b/SPECS/kernel/config_aarch64 index 930ea064975..0a08e562948 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.143.1 Kernel Configuration +# Linux/arm64 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/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json index caa1011724c..25b1ec8979c 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": "fe3ee4ca5c145ea05cedbb12e0cddace5aa0e0e8676f66abc11a3bcf40c4bd68", - "config_aarch64": "7fc2b22743ab152c84230b868ca5958bd7536b666396eb7fe505605b715e1d4b", + "config": "652e816787b588f1a24c8ac09c56a1ef7a53f017e9ccbde7680f0628a381a78e", + "config_aarch64": "49028e6fba0e0f4951caef3c8c457b666cb584b6fd1b2043f756ca810387d37e", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", - "kernel-5.15.143.1.tar.gz": "77b4a38b73d654f2e9388880aea8751c44a375b0fb66d11b26a2a9df0da4a609" + "kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" } -} \ No newline at end of file +} diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec index 31830546bfd..6a04349520f 100644 --- a/SPECS/kernel/kernel.spec +++ b/SPECS/kernel/kernel.spec @@ -27,7 +27,7 @@ Summary: Linux Kernel Name: kernel -Version: 5.15.143.1 +Version: 5.15.139.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -426,9 +426,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg %{_sysconfdir}/bash_completion.d/bpftool %changelog -* Tue Dec 19 2023 CBL-Mariner Servicing Account - 5.15.143.1-1 -- Auto-upgrade to 5.15.143.1 - * Tue Dec 05 2023 CBL-Mariner Servicing Account - 5.15.139.1-1 - Auto-upgrade to 5.15.139.1 diff --git a/cgmanifest.json b/cgmanifest.json index 271de5cffb5..74c436b5a1a 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6540,8 +6540,8 @@ "type": "other", "other": { "name": "hyperv-daemons", - "version": "5.15.143.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/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/5.15.139.1.tar.gz" } } }, @@ -8121,8 +8121,8 @@ "type": "other", "other": { "name": "kernel", - "version": "5.15.143.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/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/5.15.139.1.tar.gz" } } }, @@ -8131,8 +8131,8 @@ "type": "other", "other": { "name": "kernel-azure", - "version": "5.15.143.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/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/5.15.139.1.tar.gz" } } }, @@ -8141,8 +8141,8 @@ "type": "other", "other": { "name": "kernel-hci", - "version": "5.15.143.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/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/5.15.139.1.tar.gz" } } }, @@ -8151,8 +8151,8 @@ "type": "other", "other": { "name": "kernel-headers", - "version": "5.15.143.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/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/5.15.139.1.tar.gz" } } }, diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 8635ace77b4..1beb1939a37 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-19.cm2.aarch64.rpm -kernel-headers-5.15.143.1-1.cm2.noarch.rpm +kernel-headers-5.15.139.1-1.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 4d61c6c5cc2..a25fcd69748 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-19.cm2.x86_64.rpm -kernel-headers-5.15.143.1-1.cm2.noarch.rpm +kernel-headers-5.15.139.1-1.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 48896c01740..6c540da9056 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.143.1-1.cm2.noarch.rpm +kernel-headers-5.15.139.1-1.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 cfd60f5966d..befc9f4752f 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.143.1-1.cm2.noarch.rpm +kernel-headers-5.15.139.1-1.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