microsoft
/
CBL-Mariner
зеркало из https://github.com/microsoft/CBL-Mariner.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Kernel upgrade to version 5.15.145.2 (#7280)

This commit is contained in:
Gary Swalling 2024-01-16 20:23:43 -08:00 коммит произвёл GitHub
Родитель c29c87f98b
Коммит 1328babbb5
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
25 изменённых файлов: 74 добавлений и 40 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec
Просмотреть файл

@ -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.139.1 Version: 5.15.145.2
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
* Tue Jan 16 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.145.2-1
- Update to 5.15.145.2
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1 * Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
- Auto-upgrade to 5.15.139.1 - Auto-upgrade to 5.15.139.1

5
SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec
Просмотреть файл

@ -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.139.1 Version: 5.15.145.2
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
* Tue Jan 16 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.145.2-1
- Update to 5.15.145.2
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1 * Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
- Auto-upgrade to 5.15.139.1 - Auto-upgrade to 5.15.139.1

5
SPECS-SIGNED/kernel-signed/kernel-signed.spec
Просмотреть файл

@ -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.139.1 Version: 5.15.145.2
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
* Tue Jan 16 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.145.2-1
- Update to 5.15.145.2
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1 * Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
- Auto-upgrade to 5.15.139.1 - Auto-upgrade to 5.15.139.1

2
SPECS/hyperv-daemons/hyperv-daemons.signatures.json
Просмотреть файл

@ -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.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" "kernel-5.15.145.2.tar.gz": "5f09cdfe9d04b035d98d5aa5b22dd03e3cd6350ace51dab5c3ceea9283da7b0a"
} }
} }

5
SPECS/hyperv-daemons/hyperv-daemons.spec
Просмотреть файл

@ -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.139.1 Version: 5.15.145.2
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
* Tue Jan 16 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.145.2-1
- Update to 5.15.145.2
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1 * Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
- Auto-upgrade to 5.15.139.1 - Auto-upgrade to 5.15.139.1

2
SPECS/kernel-azure/config
Просмотреть файл

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.15.139.1 Kernel Configuration # Linux/x86_64 5.15.145.2 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

3
SPECS/kernel-azure/config_aarch64
Просмотреть файл

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.15.139.1 Kernel Configuration # Linux/arm64 5.15.145.2 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
@ -3385,7 +3385,6 @@ CONFIG_DWMAC_ROCKCHIP=m
CONFIG_DWMAC_SUN8I=m CONFIG_DWMAC_SUN8I=m
CONFIG_DWMAC_IMX8=m CONFIG_DWMAC_IMX8=m
# CONFIG_DWMAC_INTEL_PLAT is not set # CONFIG_DWMAC_INTEL_PLAT is not set
# CONFIG_DWMAC_LOONGSON is not set
# CONFIG_STMMAC_PCI is not set # CONFIG_STMMAC_PCI is not set
CONFIG_NET_VENDOR_SUN=y CONFIG_NET_VENDOR_SUN=y
CONFIG_HAPPYMEAL=m CONFIG_HAPPYMEAL=m

6
SPECS/kernel-azure/kernel-azure.signatures.json
Просмотреть файл

@ -1,9 +1,9 @@
{ {
"Signatures": { "Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "19c6638e60dd22da56be747f5f606fe4bc2adbe4b577ef5397e89f9d0c4ea87b", "config": "70924bb071b2388d23d1cb3ee7a2e6eb4fda483d1264fa365a200a5cba341006",
"config_aarch64": "90e2887cacf5b35923a9a743225b6cc727adb19a3a7a174fa9dd7c2f4e78959a", "config_aarch64": "6d5e3bb21860d075aac8756076f85e0935a24455fd615084dddfa429ac822883",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
"kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" "kernel-5.15.145.2.tar.gz": "5f09cdfe9d04b035d98d5aa5b22dd03e3cd6350ace51dab5c3ceea9283da7b0a"
} }
} }

5
SPECS/kernel-azure/kernel-azure.spec
Просмотреть файл

@ -27,7 +27,7 @@
Summary: Linux Kernel Summary: Linux Kernel
Name: kernel-azure Name: kernel-azure
Version: 5.15.139.1 Version: 5.15.145.2
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
@ -420,6 +420,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool %{_sysconfdir}/bash_completion.d/bpftool
%changelog %changelog
* Tue Jan 16 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.145.2-1
- Update to 5.15.145.2
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1 * Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
- Auto-upgrade to 5.15.139.1 - Auto-upgrade to 5.15.139.1

2
SPECS/kernel-hci/0005-net-mlx5-Lag-move-lag-files-into-directory.patch
Просмотреть файл

@ -74,7 +74,7 @@ index 3aa8d0b83d10..8ca1db84ca21 100644
+#include "lag/mp.h" +#include "lag/mp.h"
#define nic_chains(priv) ((priv)->fs.tc.chains) #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 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
similarity index 99% similarity index 99%
rename from drivers/net/ethernet/mellanox/mlx5/core/lag.c rename from drivers/net/ethernet/mellanox/mlx5/core/lag.c

2
SPECS/kernel-hci/config
Просмотреть файл

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.15.139.1 Kernel Configuration # Linux/x86_64 5.15.145.2 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

4
SPECS/kernel-hci/kernel-hci.signatures.json
Просмотреть файл

@ -1,7 +1,7 @@
{ {
"Signatures": { "Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "b3dc3eafbbb4670e50adc73066644e2274c4801117f4e6109970c6dd45494e32", "config": "711fe10570a682f6aada220356e3e7ddd4a27713a7a821dc9fc6128b89709e44",
"kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" "kernel-5.15.145.2.tar.gz": "5f09cdfe9d04b035d98d5aa5b22dd03e3cd6350ace51dab5c3ceea9283da7b0a"
} }
} }

5
SPECS/kernel-hci/kernel-hci.spec
Просмотреть файл

@ -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.139.1 Version: 5.15.145.2
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
@ -435,6 +435,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool %{_sysconfdir}/bash_completion.d/bpftool
%changelog %changelog
* Tue Jan 16 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.145.2-1
- Update to 5.15.145.2
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1 * Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
- Auto-upgrade to 5.15.139.1 - Auto-upgrade to 5.15.139.1

2
SPECS/kernel-headers/kernel-headers.signatures.json
Просмотреть файл

@ -1,5 +1,5 @@
{ {
"Signatures": { "Signatures": {
"kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" "kernel-5.15.145.2.tar.gz": "5f09cdfe9d04b035d98d5aa5b22dd03e3cd6350ace51dab5c3ceea9283da7b0a"
} }
} }

5
SPECS/kernel-headers/kernel-headers.spec
Просмотреть файл

@ -1,6 +1,6 @@
Summary: Linux API header files Summary: Linux API header files
Name: kernel-headers Name: kernel-headers
Version: 5.15.139.1 Version: 5.15.145.2
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
* Tue Jan 16 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.145.2-1
- Update to 5.15.145.2
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1 * Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
- Auto-upgrade to 5.15.139.1 - Auto-upgrade to 5.15.139.1

2
SPECS/kernel/config
Просмотреть файл

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 5.15.139.1 Kernel Configuration # Linux/x86_64 5.15.145.2 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

3
SPECS/kernel/config_aarch64
Просмотреть файл

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.15.139.1 Kernel Configuration # Linux/arm64 5.15.145.2 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
@ -3387,7 +3387,6 @@ CONFIG_DWMAC_ROCKCHIP=m
CONFIG_DWMAC_SUN8I=m CONFIG_DWMAC_SUN8I=m
CONFIG_DWMAC_IMX8=m CONFIG_DWMAC_IMX8=m
# CONFIG_DWMAC_INTEL_PLAT is not set # CONFIG_DWMAC_INTEL_PLAT is not set
# CONFIG_DWMAC_LOONGSON is not set
# CONFIG_STMMAC_PCI is not set # CONFIG_STMMAC_PCI is not set
CONFIG_NET_VENDOR_SUN=y CONFIG_NET_VENDOR_SUN=y
CONFIG_HAPPYMEAL=m CONFIG_HAPPYMEAL=m

6
SPECS/kernel/kernel.signatures.json
Просмотреть файл

@ -1,9 +1,9 @@
{ {
"Signatures": { "Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0", "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "652e816787b588f1a24c8ac09c56a1ef7a53f017e9ccbde7680f0628a381a78e", "config": "a36f5ee119e1a7f1c00ccb36f37346b0f1d86a34dba133c1e10053a3463d5225",
"config_aarch64": "49028e6fba0e0f4951caef3c8c457b666cb584b6fd1b2043f756ca810387d37e", "config_aarch64": "2e9f491e416e74867c0ec50463847f8335b51934e71071d2e2977cc19bf99015",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f", "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
"kernel-5.15.139.1.tar.gz": "7dc657637a9ef4d2491eeae364e6ab0132ea4db3b1a9db7c2601eaf009200459" "kernel-5.15.145.2.tar.gz": "5f09cdfe9d04b035d98d5aa5b22dd03e3cd6350ace51dab5c3ceea9283da7b0a"
} }
} }

5
SPECS/kernel/kernel.spec
Просмотреть файл

@ -27,7 +27,7 @@
Summary: Linux Kernel Summary: Linux Kernel
Name: kernel Name: kernel
Version: 5.15.139.1 Version: 5.15.145.2
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
@ -426,6 +426,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool %{_sysconfdir}/bash_completion.d/bpftool
%changelog %changelog
* Tue Jan 16 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.145.2-1
- Update to 5.15.145.2
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1 * Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
- Auto-upgrade to 5.15.139.1 - Auto-upgrade to 5.15.139.1

20
cgmanifest.json
Просмотреть файл

@ -6540,8 +6540,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "hyperv-daemons", "name": "hyperv-daemons",
"version": "5.15.139.1", "version": "5.15.145.2",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.139.1.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.145.2.tar.gz"
} }
} }
}, },
@ -8121,8 +8121,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "kernel", "name": "kernel",
"version": "5.15.139.1", "version": "5.15.145.2",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.139.1.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.145.2.tar.gz"
} }
} }
}, },
@ -8131,8 +8131,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "kernel-azure", "name": "kernel-azure",
"version": "5.15.139.1", "version": "5.15.145.2",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.139.1.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.145.2.tar.gz"
} }
} }
}, },
@ -8141,8 +8141,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "kernel-hci", "name": "kernel-hci",
"version": "5.15.139.1", "version": "5.15.145.2",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.139.1.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.145.2.tar.gz"
} }
} }
}, },
@ -8151,8 +8151,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "kernel-headers", "name": "kernel-headers",
"version": "5.15.139.1", "version": "5.15.145.2",
"downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.139.1.tar.gz" "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.145.2.tar.gz"
} }
} }
}, },

2
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
Просмотреть файл

@ -1,5 +1,5 @@
filesystem-1.1-19.cm2.aarch64.rpm filesystem-1.1-19.cm2.aarch64.rpm
kernel-headers-5.15.139.1-1.cm2.noarch.rpm kernel-headers-5.15.145.2-1.cm2.noarch.rpm
glibc-2.35-6.cm2.aarch64.rpm glibc-2.35-6.cm2.aarch64.rpm
glibc-devel-2.35-6.cm2.aarch64.rpm glibc-devel-2.35-6.cm2.aarch64.rpm
glibc-i18n-2.35-6.cm2.aarch64.rpm glibc-i18n-2.35-6.cm2.aarch64.rpm

2
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
Просмотреть файл

@ -1,5 +1,5 @@
filesystem-1.1-19.cm2.x86_64.rpm filesystem-1.1-19.cm2.x86_64.rpm
kernel-headers-5.15.139.1-1.cm2.noarch.rpm kernel-headers-5.15.145.2-1.cm2.noarch.rpm
glibc-2.35-6.cm2.x86_64.rpm glibc-2.35-6.cm2.x86_64.rpm
glibc-devel-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 glibc-i18n-2.35-6.cm2.x86_64.rpm

2
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 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.139.1-1.cm2.noarch.rpm kernel-headers-5.15.145.2-1.cm2.noarch.rpm
kmod-29-2.cm2.aarch64.rpm kmod-29-2.cm2.aarch64.rpm
kmod-debuginfo-29-2.cm2.aarch64.rpm kmod-debuginfo-29-2.cm2.aarch64.rpm
kmod-devel-29-2.cm2.aarch64.rpm kmod-devel-29-2.cm2.aarch64.rpm

2
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 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.139.1-1.cm2.noarch.rpm kernel-headers-5.15.145.2-1.cm2.noarch.rpm
kmod-29-2.cm2.x86_64.rpm kmod-29-2.cm2.x86_64.rpm
kmod-debuginfo-29-2.cm2.x86_64.rpm kmod-debuginfo-29-2.cm2.x86_64.rpm
kmod-devel-29-2.cm2.x86_64.rpm kmod-devel-29-2.cm2.x86_64.rpm

12
toolkit/scripts/mariner-required-configs.json
Просмотреть файл

@ -1336,6 +1336,18 @@
"PR": [ "PR": [
"https://github.com/microsoft/CBL-Mariner/pull/6829" "https://github.com/microsoft/CBL-Mariner/pull/6829"
] ]
},
"CONFIG_DWMAC_LOONGSON": {
"value": [
"<missing>"
],
"arch": [
"ARM64"
],
"comment": "Needed for update to 5.15.145.2",
"PR": [
"https://github.com/microsoft/CBL-Mariner/pull/7280"
]
} }
} }
} }