Skip to content

Commit 3ea6c95

Browse files
jslobodzianjslobodzian
committed
Merge branch 'main' into 2.0
2 parents 450c3cc + 2cfea6b commit 3ea6c95

161 files changed

Lines changed: 3823 additions & 1409 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.

‎.pipelines/templatesWithCheckout/SodiffCheck.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ parameters:
1313
type: string
1414
default: "rpms.tar.gz"
1515

16+
- name: sodiffRepoCommand
17+
type: string
18+
default: "sodiff-repo"
19+
20+
- name: sodiffRepoFile
21+
type: string
22+
default: "sodiff.repo"
23+
1624
- name: sourcesWorkspace
1725
type: string
1826
default: "$(Agent.TempDirectory)/SourcesWorkspace"
@@ -52,16 +60,16 @@ steps:
5260
sodiff_out_dir="${{ parameters.buildRepoRoot }}/out/sodiff"
5361
mkdir -p $sodiff_out_dir
5462
55-
echo "Generate sodiff.repo file"
56-
sudo make -sC "$toolkit_dir" sodiff-repo
63+
echo "Generate sodiff repo file"
64+
sudo make -sC "$toolkit_dir" ${{ parameters.sodiffRepoCommand }}
5765
5866
echo "Generate input file"
5967
find $sodiff_rpms_dir -type f -name '*.rpm' -exec basename {} \; > ./sodiff-rpms
6068
6169
sodiff_release_ver=`cat ${{ parameters.buildRepoRoot }}/SPECS/mariner-release/mariner-release.spec | grep "Version:" | cut -d " " -f 1 --complement | xargs`
6270
echo "sodiff release ver: $sodiff_release_ver"
6371
64-
$toolkit_dir/scripts/sodiff/mariner-sodiff.sh $sodiff_rpms_dir/ $toolkit_dir/scripts/sodiff/sodiff.repo $sodiff_release_ver $sodiff_out_dir < ./sodiff-rpms
72+
$toolkit_dir/scripts/sodiff/mariner-sodiff.sh -r $sodiff_rpms_dir/ -f ${{ parameters.buildRepoRoot }}/build/sodiff/${{ parameters.sodiffRepoFile }} -v $sodiff_release_ver -o $sodiff_out_dir -e true < ./sodiff-rpms
6573
6674
67-
displayName: "Sodiff check"
75+
displayName: "Sodiff check"

‎SPECS-EXTENDED/nmi/nmi.spec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Summary: Node Managed Identity
33
Name: nmi
44
Version: 1.8.17
5-
Release: 3%{?dist}
5+
Release: 4%{?dist}
66
License: MIT
77
Vendor: Microsoft Corporation
88
Distribution: Mariner
@@ -26,7 +26,7 @@ Source0: %{name}-%{version}.tar.gz
2626
Source1: %{name}-%{version}-vendor-v2.tar.gz
2727
Patch0: modify-go-build-option.patch
2828
Patch1: CVE-2023-45288.patch
29-
BuildRequires: golang >= 1.15
29+
BuildRequires: golang
3030

3131
%description
3232
NMI is the resource that is used when your pods look to use their identity.
@@ -62,6 +62,9 @@ popd
6262
%{_bindir}/%{name}
6363

6464
%changelog
65+
* Wed Jul 17 2024 Muhammad Falak R Wani <mwani@microsoft.com> - 1.8.17-4
66+
- Drop requirement on a specific version of golang
67+
6568
* Thu Jun 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.8.17-3
6669
- Bump release to rebuild with go 1.21.11
6770

‎SPECS-EXTENDED/umoci/umoci.spec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: Open Container Image manipulation tool
22
Name: umoci
33
Version: 0.4.7
4-
Release: 15%{?dist}
4+
Release: 16%{?dist}
55
License: Apache-2.0
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -10,7 +10,7 @@ URL: https://github.com/opencontainers/umoci
1010
Source0: https://github.com/opencontainers/umoci/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
1111
%global debug_package %{nil}
1212
%define our_gopath %{_topdir}/.gopath
13-
BuildRequires: golang >= 1.17.9
13+
BuildRequires: golang
1414

1515
%description
1616
umoci modifies Open Container images.
@@ -39,6 +39,9 @@ go test -mod=vendor
3939
%{_bindir}/umoci
4040

4141
%changelog
42+
* Wed Jul 17 2024 Muhammad Falak R Wani <mwani@microsoft.com> - 0.4.7-16
43+
- Drop requirement on a specific version of golang
44+
4245
* Thu Jun 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 0.4.7-15
4346
- Bump release to rebuild with go 1.21.11
4447

‎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: 4%{?dist}
9+
Release: 5%{?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+
* Wed Jun 19 2024 Archana Choudhary <archana1@microsoft.com> - 1.0.1-5
73+
- Update version for consistency with hvloader spec
74+
7275
* Thu Jun 06 2024 Archana Choudhary <archana1@microsoft.com> - 1.0.1-4
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.160.1
12+
Version: 5.15.162.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+
* Wed Jul 17 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.162.2-1
157+
- Auto-upgrade to 5.15.162.2
158+
159+
* Thu Jul 11 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.162.1-1
160+
- Auto-upgrade to 5.15.162.1
161+
156162
* Sat Jun 08 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.160.1-1
157163
- Auto-upgrade to 5.15.160.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.160.1
7+
Version: 5.15.162.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+
* Wed Jul 17 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.162.2-1
153+
- Auto-upgrade to 5.15.162.2
154+
155+
* Thu Jul 11 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.162.1-1
156+
- Auto-upgrade to 5.15.162.1
157+
152158
* Sat Jun 08 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.160.1-1
153159
- Auto-upgrade to 5.15.160.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.2
7+
Version: 5.15.161.1
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+
* Wed Jul 24 2024 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 5.15.161.1-1
154+
- Update to 5.15.161.1
155+
153156
* Fri Jun 07 2024 Gary Swalling <gaswal@microsoft.com> - 5.15.158.2-1
154157
- Update to 5.15.158.2
155158

‎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.160.1
12+
Version: 5.15.162.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+
* Wed Jul 17 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.162.2-1
157+
- Auto-upgrade to 5.15.162.2
158+
159+
* Thu Jul 11 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.162.1-1
160+
- Auto-upgrade to 5.15.162.1
161+
156162
* Sat Jun 08 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.160.1-1
157163
- Auto-upgrade to 5.15.160.1
158164

‎SPECS/KeysInUse-OpenSSL/KeysInUse-OpenSSL.spec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: The KeysInUse Engine for OpenSSL allows the logging of private key usage through OpenSSL
22
Name: KeysInUse-OpenSSL
33
Version: 0.3.4
4-
Release: 5%{?dist}
4+
Release: 6%{?dist}
55
License: MIT
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -10,7 +10,7 @@ URL: https://github.com/microsoft/KeysInUse-OpenSSL
1010
Source0: https://github.com/microsoft/KeysInUse-OpenSSL/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
1111
BuildRequires: cmake
1212
BuildRequires: gcc
13-
BuildRequires: golang >= 1.16.6
13+
BuildRequires: golang
1414
BuildRequires: make
1515
BuildRequires: openssl-devel
1616
Requires: openssl < 1.1.2
@@ -74,6 +74,9 @@ if [ -x %{_bindir}/keysinuseutil ]; then
7474
fi
7575

7676
%changelog
77+
* Wed Jul 17 2024 Muhammad Falak R Wani <mwani@microsoft.com> - 0.3.4-6
78+
- Drop requirement on a specific version of golang
79+
7780
* Thu Jun 06 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 0.3.4-5
7881
- Bump release to rebuild with go 1.21.11
7982

‎SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)