Skip to content

Commit 48f3049

Browse files
authored
kata: build on aarch64 (#14837)
Signed-off-by: Saul Paredes <saulparedes@microsoft.com>
1 parent 85e775b commit 48f3049

10 files changed

Lines changed: 14740 additions & 26 deletions

File tree

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
%ifarch x86_64
44
%global buildarch x86_64
55
%endif
6+
%ifarch aarch64
7+
%global buildarch aarch64
8+
%endif
69
%define uname_r %{version}-%{release}
710
Summary: Signed MSHV-enabled Linux Kernel for %{buildarch} systems
811
Name: kernel-mshv-signed-%{buildarch}
912
Version: 6.6.100.mshv1
10-
Release: 1%{?dist}
13+
Release: 2%{?dist}
1114
License: GPLv2
1215
Vendor: Microsoft Corporation
1316
Distribution: Azure Linux
@@ -79,7 +82,6 @@ Requires: kmod
7982
Requires(post): coreutils
8083
Requires(postun): coreutils
8184
%{?grub2_configuration_requires}
82-
ExclusiveArch: x86_64
8385

8486
%description -n kernel-mshv
8587
The kernel package contains the signed MSHV-enabled Linux kernel.
@@ -128,14 +130,19 @@ echo "initrd of kernel %{uname_r} removed" >&2
128130
/boot/System.map-%{uname_r}
129131
/boot/config-%{uname_r}
130132
/boot/vmlinuz-%{uname_r}
133+
%ifarch x86_64
131134
/boot/efi/vmlinuz-%{uname_r}
135+
%endif
132136
%config(noreplace) %{_sysconfdir}/default/grub.d/50_mariner_mshv.cfg
133137
%config %{_sysconfdir}/grub.d/50_mariner_mshv_menuentry
134138
%defattr(0644,root,root)
135139
/lib/modules/%{uname_r}/*
136140
%exclude /lib/modules/%{uname_r}/build
137141

138142
%changelog
143+
* Wed Oct 22 2025 Saul Paredes <saulparedes@microsoft.com> - 6.6.100.mshv1-2
144+
- Enable build on aarch64
145+
139146
* Tue Sep 09 2025 Saul Paredes <saulparedes@microsoft.com> - 6.6.100.mshv1-1
140147
- Upgrade to 6.6.100.mshv1
141148

SPECS/cloud-hypervisor/cloud-hypervisor.spec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ Requires: glibc
3838
Requires: libgcc
3939
Requires: libcap
4040

41-
ExclusiveArch: x86_64
42-
4341
%ifarch x86_64
4442
%define rust_def_target x86_64-unknown-linux-gnu
4543
%define cargo_pkg_feature_opts --features "mshv"
@@ -139,6 +137,9 @@ cargo build --release --target=%{rust_musl_target} %{cargo_pkg_feature_opts} %{c
139137
%license LICENSES/CC-BY-4.0.txt
140138

141139
%changelog
140+
* Thu Oct 09 2025 Saul Paredes <saulparedes@microsoft.com> - 41.0.139-2
141+
- Enable build on aarch64
142+
142143
* Tue Sep 09 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 41.0.139-1
143144
- Auto-upgrade to 41.0.139
144145
- Rename package to cloud-hypervisor

SPECS/kata-containers/kata-containers.spec

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Name: kata-containers
44
Version: 3.19.1.kata2
5-
Release: 1%{?dist}
5+
Release: 2%{?dist}
66
Summary: Kata Containers package developed for Pod Sandboxing on AKS
77
License: ASL 2.0
88
URL: https://github.com/microsoft/kata-containers
@@ -11,8 +11,6 @@ Distribution: Azure Linux
1111
Source0: https://github.com/microsoft/kata-containers/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
1212
Source1: %{name}-%{version}-cargo.tar.gz
1313

14-
ExclusiveArch: x86_64
15-
1614
BuildRequires: azurelinux-release
1715
BuildRequires: golang
1816
BuildRequires: protobuf-compiler
@@ -115,6 +113,9 @@ popd
115113
%{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service
116114

117115
%changelog
116+
* Thu Oct 09 2025 Saul Paredes <saulparedes@microsoft.com> - 3.19.1.kata2-2
117+
- Enable build on aarch64
118+
118119
* Mon Sep 08 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 3.19.1.kata2-1
119120
- Auto-upgrade to 3.19.1.kata2
120121

SPECS/kata-packages-uvm/kata-packages-uvm.spec

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
Summary: Metapackage for Kata UVM components
22
Name: kata-packages-uvm
33
Version: 1.0.0
4-
Release: 8%{?dist}
4+
Release: 9%{?dist}
55
License: MIT
66
Vendor: Microsoft Corporation
77
Distribution: Azure Linux
88
Group: System Environment/Base
99
URL: https://aka.ms/mariner
1010

11-
ExclusiveArch: x86_64
12-
1311
Requires: ca-certificates
1412
Requires: chrony
1513
Requires: cryptsetup
@@ -64,7 +62,9 @@ Requires: acpica-tools
6462
Requires: cargo
6563
Requires: clang
6664
Requires: kata-containers-tools
65+
%ifarch x86_64
6766
Requires: kata-containers-cc-tools
67+
%endif
6868
Requires: kernel-uvm
6969
Requires: kernel-uvm-devel
7070
Requires: make
@@ -110,6 +110,9 @@ Requires: golang
110110
%files coco-sign
111111

112112
%changelog
113+
* Mon Oct 13 2025 Saul Paredes <saulparedes@microsoft.com> - 1.0.0-9
114+
- Enable build on aarch64
115+
113116
* Tue Feb 11 2025 Cameron Baird <cameronbaird@microsoft.com> - 1.0.0-8
114117
- Introduce debug metapackage
115118
- Move curl, cpio, gzip, iputils, lvm2, tar, procps-ng to debug metapackage

0 commit comments

Comments
 (0)