Skip to content

Commit bc8648f

Browse files
PawelWMSPawelWMS
committed
Merge branch 'main' into 2.0
2 parents b593ba2 + 9322acd commit bc8648f

137 files changed

Lines changed: 4927 additions & 2526 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,2 @@
1-
# By default all files require a review by at lest one member of the CBL-Mariner developers team.
2-
* @microsoft/cbl-mariner-devs
3-
4-
# Modification to this file require admin approval.
5-
/.github/CODEOWNERS @microsoft/cbl-mariner-admins
6-
7-
# Modifications to the build pipelines require admin approval.
8-
/.pipelines/* @microsoft/cbl-mariner-admins
9-
10-
# Modifications to the CredScan exceptions require admin approval.
11-
/.config/CredScanSuppressions.json @microsoft/cbl-mariner-admins
12-
13-
# Modification to what is considered "core packages" require admin approval.
14-
/SPECS/core-packages/* @microsoft/cbl-mariner-admins
15-
16-
# Modification to specific packages go to specific teams
17-
/SPECS/installkernel/* @microsoft/cbl-mariner-kernel
18-
/SPECS/kernel/* @microsoft/cbl-mariner-kernel
19-
/SPECS/kernel-azure/* @microsoft/cbl-mariner-kernel
20-
/SPECS/kernel-hci/* @microsoft/cbl-mariner-kernel
21-
/SPECS/kernel-headers/* @microsoft/cbl-mariner-kernel
22-
/SPECS/kernel-mshv/* @microsoft/cbl-mariner-kata-containers
23-
/SPECS/kernel-uvm/* @microsoft/cbl-mariner-kata-containers
24-
/SPECS-SIGNED/kernel-signed/* @microsoft/cbl-mariner-kernel
25-
/SPECS-SIGNED/kernel-hci-signed/* @microsoft/cbl-mariner-kernel
26-
/SPECS-SIGNED/kernel-azure-signed/* @microsoft/cbl-mariner-kernel
27-
/SPECS-SIGNED/kernel-mstflint-signed/* @microsoft/cbl-mariner-kernel
28-
/SPECS-SIGNED/kernel-mshv-signed/* @microsoft/cbl-mariner-kata-containers
29-
30-
/SPECS/grub2/* @microsoft/cbl-mariner-bootloader
31-
/SPECS/grubby/* @microsoft/cbl-mariner-bootloader
32-
/SPECS/shim/* @microsoft/cbl-mariner-bootloader
33-
/SPECS/shim-unsigned/* @microsoft/cbl-mariner-bootloader
34-
/SPECS/shim-unsigned-x64/* @microsoft/cbl-mariner-bootloader
35-
/SPECS/shim-unsigned-aarch64/* @microsoft/cbl-mariner-bootloader
36-
/SPECS-SIGNED/grub2-efi-binary-signed/* @microsoft/cbl-mariner-bootloader
37-
38-
/SPECS/dracut/* @microsoft/cbl-mariner-dracut
39-
/SPECS/initramfs/* @microsoft/cbl-mariner-dracut
40-
/SPECS/verity-read-only-root/* @microsoft/cbl-mariner-dracut
41-
42-
/SPECS/systemd/* @microsoft/cbl-mariner-systemd
43-
44-
/SPECS/bcc/* @microsoft/cbl-mariner-debug-tools
45-
/SPECS/bpftrace/* @microsoft/cbl-mariner-debug-tools
46-
/SPECS/crash/* @microsoft/cbl-mariner-debug-tools
47-
/SPECS/gdb/* @microsoft/cbl-mariner-debug-tools
48-
/SPECS/kexec-tools/* @microsoft/cbl-mariner-debug-tools
49-
50-
/SPECS/openssl/* @microsoft/cbl-mariner-openssl
51-
/SPECS/SymCrypt-OpenSSL/* @microsoft/cbl-mariner-openssl
52-
/SPECS/SymCrypt/* @microsoft/cbl-mariner-openssl
53-
/SPECS/KeysInUse-OpenSSL/* @microsoft/cbl-mariner-openssl
54-
55-
/SPECS/dnf/* @microsoft/cbl-mariner-package-managers
56-
/SPECS/dnf-plugins-core/* @microsoft/cbl-mariner-package-managers
57-
/SPECS/rpm/* @microsoft/cbl-mariner-package-managers
58-
/SPECS/tdnf/* @microsoft/cbl-mariner-package-managers
59-
60-
/SPECS/moby-buildx/* @microsoft/cbl-mariner-container-runtime
61-
/SPECS/moby-cli/* @microsoft/cbl-mariner-container-runtime
62-
/SPECS/moby-containerd/* @microsoft/cbl-mariner-container-runtime
63-
/SPECS/moby-containerd-cc/* @microsoft/cbl-mariner-kata-containers
64-
/SPECS/moby-engine/* @microsoft/cbl-mariner-container-runtime
65-
/SPECS/moby-runc/* @microsoft/cbl-mariner-container-runtime
66-
/SPECS/kata-containers/* @microsoft/cbl-mariner-kata-containers
67-
/SPECS/kata-containers-cc/* @microsoft/cbl-mariner-kata-containers
68-
/SPECS/virtiofsd/* @microsoft/cbl-mariner-kata-containers
69-
70-
/SPECS/cloud-hypervisor/* @microsoft/cbl-mariner-virtualization
71-
/SPECS/hvloader/* @microsoft/cbl-mariner-kata-containers
72-
/SPECS-SIGNED/hvloader-signed/* @microsoft/cbl-mariner-kata-containers
73-
74-
/SPECS/cloud-init/* @microsoft/cbl-mariner-provisioning
75-
/SPECS/walinuxagent/* @microsoft/cbl-mariner-provisioning
76-
77-
# Modifications to the toolkit requires reviews from the toolkit team
78-
/toolkit/ @microsoft/cbl-mariner-tooling
79-
80-
# Docs to be reviewed by general CBL-Mariner devs
81-
/toolkit/docs/ @microsoft/cbl-mariner-devs
82-
83-
# Default image configurations to be reviewed by general CBL-Mariner devs
84-
/toolkit/imageconfigs/ @microsoft/cbl-mariner-devs
85-
86-
# Package and toolchain manifests to be reviewed by general CBL-Mariner devs
87-
/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @microsoft/cbl-mariner-devs
88-
/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @microsoft/cbl-mariner-devs
89-
/toolkit/resources/manifests/package/toolchain_aarch64.txt @microsoft/cbl-mariner-devs
90-
/toolkit/resources/manifests/package/toolchain_x86_64.txt @microsoft/cbl-mariner-devs
91-
92-
# Modifications to the raw toolchain require admin approval.
93-
/toolkit/scripts/toolchain/container/* @microsoft/cbl-mariner-admins
94-
/toolkit/scripts/toolchain/cgmanifest.json @microsoft/cbl-mariner-admins
95-
/toolkit/scripts/toolchain/create_toolchain_in_container.sh @microsoft/cbl-mariner-admins
96-
97-
# Modifications to the trusted CA certificates require admin approval.
98-
/SPECS/*ca-certificates*/* @microsoft/cbl-mariner-admins
1+
# For stable release branches, ensure stable release maintainers are added as code reviewers
2+
* @microsoft/cbl-mariner-stable-maintainers

‎SPECS-SIGNED/hvloader-signed/hvloader-signed.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed HvLoader.efi for %{buildarch} systems
77
Name: hvloader-signed-%{buildarch}
88
Version: 1.0.1
9-
Release: 2%{?dist}
9+
Release: 3%{?dist}
1010
License: MIT
1111
Vendor: Microsoft Corporation
1212
Distribution: Mariner
@@ -69,6 +69,9 @@ popd
6969
/boot/efi/HvLoader.efi
7070

7171
%changelog
72+
* Fri May 31 2024 Archana Choudhary <archana1@microsoft.com> - 1.0.1-3.cm2
73+
- Update version for consistency with hvloader spec
74+
7275
* Fri May 10 2024 Archana Choudhary <archana1@microsoft.com> - 1.0.1-2
7376
- Update version for consistency with hvloader spec
7477

‎SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for Azure
1111
Name: kernel-azure-signed-%{buildarch}
12-
Version: 5.15.158.1
12+
Version: 5.15.158.2
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,6 +153,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Fri Jun 07 2024 Rachel Menge <rachelmenge@microsoft.com> - 5.15.158.2-1
157+
- Revert to 5.15.158.2
158+
159+
* Wed May 22 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.159.1-1
160+
- Auto-upgrade to 5.15.159.1
161+
156162
* Fri May 10 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.158.1-1
157163
- Auto-upgrade to 5.15.158.1
158164

‎SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%define uname_r %{version}-%{release}
55
Summary: Signed Linux Kernel for HCI
66
Name: kernel-hci-signed-%{buildarch}
7-
Version: 5.15.158.1
7+
Version: 5.15.158.2
88
Release: 1%{?dist}
99
License: GPLv2
1010
Vendor: Microsoft Corporation
@@ -149,6 +149,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
149149
%exclude /module_info.ld
150150

151151
%changelog
152+
* Fri Jun 07 2024 Rachel Menge <rachelmenge@microsoft.com> - 5.15.158.2-1
153+
- Revert to 5.15.158.2
154+
155+
* Wed May 22 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.159.1-1
156+
- Auto-upgrade to 5.15.159.1
157+
152158
* Fri May 10 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.158.1-1
153159
- Auto-upgrade to 5.15.158.1
154160

‎SPECS-SIGNED/kernel-mos-signed/kernel-mos-signed.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%define uname_r %{version}-%{release}
55
Summary: Signed Linux Kernel for MOS systems
66
Name: kernel-mos-signed-%{buildarch}
7-
Version: 5.15.158.1
7+
Version: 5.15.158.2
88
Release: 1%{?dist}
99
License: GPLv2
1010
Vendor: Microsoft Corporation
@@ -150,6 +150,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
150150
%exclude /module_info.ld
151151

152152
%changelog
153+
* Fri Jun 07 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.158.2-1
154+
- Update to 5.15.158.2
155+
153156
* Wed May 08 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.158.1-1
154157
- Update to 5.15.158.1
155158

‎SPECS-SIGNED/kernel-mshv-signed/kernel-mshv-signed.spec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
%define uname_r %{version}-%{release}
77
Summary: Signed MSHV-enabled Linux Kernel for %{buildarch} systems
88
Name: kernel-mshv-signed-%{buildarch}
9-
Version: 5.15.126.mshv9
10-
Release: 3%{?dist}
9+
Version: 5.15.157.mshv1
10+
Release: 1%{?dist}
1111
License: GPLv2
1212
Vendor: Microsoft Corporation
1313
Distribution: Mariner
@@ -149,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner-mshv.cfg
149149
%exclude /lib/modules/%{uname_r}/build
150150

151151
%changelog
152+
* Tue May 14 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.157.mshv1-1
153+
- Auto-upgrade to 5.15.157.mshv1
154+
152155
* Mon Apr 01 2024 Cameron Baird <cameronbaird@microsoft.com> - 5.15.126.mshv9-3
153156
- BuildRequires: grub2-rpm-macros to expand mkconfig configuration requirement
154157

‎SPECS-SIGNED/kernel-signed/kernel-signed.spec‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
12-
Version: 5.15.158.1
12+
Version: 5.15.158.2
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,6 +153,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Fri Jun 07 2024 Rachel Menge <rachelmenge@microsoft.com> - 5.15.158.2-1
157+
- Revert to 5.15.158.2
158+
159+
* Wed May 22 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.159.1-1
160+
- Auto-upgrade to 5.15.159.1
161+
156162
* Fri May 10 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.158.1-1
157163
- Auto-upgrade to 5.15.158.1
158164

0 commit comments

Comments
 (0)