Skip to content

Commit 40cde92

Browse files
authored
kernel-mshv: buildrequire grub2-rpm-macros to fix macro expansion (#8636)
1 parent 853ffb8 commit 40cde92

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Summary: Signed MSHV-enabled Linux Kernel for %{buildarch} systems
88
Name: kernel-mshv-signed-%{buildarch}
99
Version: 5.15.126.mshv9
10-
Release: 2%{?dist}
10+
Release: 3%{?dist}
1111
License: GPLv2
1212
Vendor: Microsoft Corporation
1313
Distribution: Mariner
@@ -66,6 +66,7 @@ Source0: kernel-mshv-%{version}-%{release}.%{buildarch}.rpm
6666
Source1: vmlinuz-%{uname_r}
6767
Source2: sha512hmac-openssl.sh
6868
BuildRequires: cpio
69+
BuildRequires: grub2-rpm-macros
6970
BuildRequires: openssl
7071
BuildRequires: sed
7172

@@ -148,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner-mshv.cfg
148149
%exclude /lib/modules/%{uname_r}/build
149150

150151
%changelog
152+
* Mon Apr 01 2024 Cameron Baird <cameronbaird@microsoft.com> - 5.15.126.mshv9-3
153+
- BuildRequires: grub2-rpm-macros to expand mkconfig configuration requirement
154+
151155
* Thu Jan 04 2024 Cameron Baird <cameronbaird@microsoft.com> - 5.15.126.mshv9-2
152156
- Original version for CBL-Mariner.
153157
- License verified

SPECS/kernel-mshv/kernel-mshv.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Summary: Mariner kernel that has MSHV Host support
1212
Name: kernel-mshv
1313
Version: 5.15.126.mshv9
14-
Release: 2%{?dist}
14+
Release: 3%{?dist}
1515
License: GPLv2
1616
Group: Development/Tools
1717
Vendor: Microsoft Corporation
@@ -248,6 +248,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner-mshv.cfg
248248
%{_includedir}/perf/perf_dlfilter.h
249249

250250
%changelog
251+
* Mon Apr 01 2024 Cameron Baird <cameronbaird@microsoft.com> - 5.15.126.mshv9-3
252+
- Bump release to match kernel-mshv-signed package
253+
251254
* Mon Nov 20 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.126.mshv9-2
252255
- Add cpio as BuildRequires
253256

0 commit comments

Comments
 (0)