kata: Upgrade to GA bits (microsoft#14643)

Signed-off-by: Saul Paredes <[email protected]>
Co-authored-by: Rachel Menge <[email protected]>
Co-authored-by: Manuel Huber <[email protected]>
Co-authored-by: CBL-Mariner Servicing Account <[email protected]>

Author: 4 people

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

@@ -2257,7 +2257,7 @@
                 "cf-cli",
                 "check-restart",
                 "clamav",
-                "cloud-hypervisor-cvm",
+                "cloud-hypervisor",
                 "cloud-provider-kubevirt",
                 "cmake-fedora",
                 "containerd2",

LICENSES-AND-NOTICES/SPECS/data/licenses.json

@@ -6,7 +6,7 @@
 %define uname_r %{version}-%{release}
 Summary:        Signed MSHV-enabled Linux Kernel for %{buildarch} systems
 Name:           kernel-mshv-signed-%{buildarch}
-Version:        6.6.57.mshv4
+Version:        6.6.100.mshv1
 Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@@ -136,6 +136,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
 %exclude /lib/modules/%{uname_r}/build
 
 %changelog
+* Tue Sep 09 2025 Saul Paredes <[email protected]> - 6.6.100.mshv1-1
+- Upgrade to 6.6.100.mshv1
+
 * Tue May 06 2025 Manuel Huber <[email protected]> - 6.6.57.mshv4-1
 - Upgrade to 6.6.57.mshv4
 

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

@@ -0,0 +1,6 @@
+{
+  "Signatures": {
+    "cloud-hypervisor-41.0.139-vendor.tar.gz": "44d4f5770968c2482d7da25bb18cd399b8eb9b6a5f1de5aa816083954d1c8241",
+    "cloud-hypervisor-41.0.139.tar.gz": "116191af642c8c57710205cefab0787a5fd903e3a946638b1380cac732a8e381"
+  }
+}

SPECS/cloud-hypervisor-cvm/cloud-hypervisor-cvm.signatures.json

@@ -2,10 +2,10 @@
 %define using_musl_libc 0
 %define using_vendored_crates 1
 
-Name:           cloud-hypervisor-cvm
-Summary:        Cloud Hypervisor CVM is an open source Virtual Machine Monitor (VMM) that enables running SEV SNP enabled VMs on top of MSHV using the IGVM file format as payload.
-Version:        41.0.79
-Release:        4%{?dist}
+Name:           cloud-hypervisor
+Summary:        Cloud Hypervisor is an open source Virtual Machine Monitor (VMM) that runs on top of the KVM hypervisor and the Microsoft Hypervisor (MSHV).
+Version:        41.0.139
+Release:        1%{?dist}
 License:        ASL 2.0 OR BSD-3-clause
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -20,7 +20,6 @@ Source0:        https://github.com/microsoft/cloud-hypervisor/archive/refs/tags/
 #   cargo vendor > config.toml
 #   tar -czf %%{name}-%%{version}-vendor.tar.gz vendor/
 Source1:        %{name}-%{version}-vendor.tar.gz
-Source2:        config.toml
 %endif
 
 BuildRequires:  binutils
@@ -43,7 +42,7 @@ ExclusiveArch:  x86_64
 
 %ifarch x86_64
 %define rust_def_target x86_64-unknown-linux-gnu
-%define cargo_pkg_feature_opts --no-default-features --features "mshv,kvm,sev_snp,igvm"
+%define cargo_pkg_feature_opts --features "mshv"
 %endif
 %ifarch aarch64
 %define rust_def_target aarch64-unknown-linux-gnu
@@ -63,6 +62,12 @@ ExclusiveArch:  x86_64
 %define cargo_offline --offline
 %endif
 
+# This package replaces cloud-hypervisor-cvm. As of 9/10/2025, cloud-hypervisor-cvm is a deprecated name.
+# This is a temporary measure for compatibility.
+# todo: remove this provides/obsoletes pair in the future.
+Provides: cloud-hypervisor-cvm = %{version}-%{release}
+Obsoletes: cloud-hypervisor-cvm < %{version}-%{release}
+
 %description
 Cloud Hypervisor is an open source Virtual Machine Monitor (VMM) that runs on top of KVM. The project focuses on exclusively running modern, cloud workloads, on top of a limited set of hardware architectures and platforms. Cloud workloads refers to those that are usually run by customers inside a cloud provider. For our purposes this means modern Linux* distributions with most I/O handled by paravirtualised devices (i.e. virtio), no requirement for legacy devices and recent CPUs and KVM.
 
@@ -71,8 +76,6 @@ Cloud Hypervisor is an open source Virtual Machine Monitor (VMM) that runs on to
 %setup -q -n cloud-hypervisor-%{version}
 %if 0%{?using_vendored_crates}
 tar xf %{SOURCE1}
-mkdir -p .cargo
-cp %{SOURCE2} .cargo/
 %endif
 
 %install
@@ -136,6 +139,10 @@ cargo build --release --target=%{rust_musl_target} %{cargo_pkg_feature_opts} %{c
 %license LICENSES/CC-BY-4.0.txt
 
 %changelog
+* Tue Sep 09 2025 CBL-Mariner Servicing Account <[email protected]> - 41.0.139-1
+- Auto-upgrade to 41.0.139
+- Rename package to cloud-hypervisor
+
 * Fri Aug 08 2025 Azure Linux Security Servicing Account <[email protected]> - 41.0.79-4
 - Bump release to rebuild with rust
 

SPECS/cloud-hypervisor-cvm/config.toml

@@ -1,6 +1,6 @@
 {
   "Signatures": {
-    "kata-containers-3.19.1.kata1-cargo.tar.gz": "4c0420e92432bfa5a4a6ea691098efb0683d9afbe04f8fe314dd2c2a8133994b",
-    "kata-containers-3.19.1.kata1.tar.gz": "5921c8d7f9564909ace1443724f91efa12b09d4eeb8585bf8f0cf4fd3faf9d4b"
+    "kata-containers-3.19.1.kata2.tar.gz": "533746001a7ed8a1cc9fd2f05a612406baf187676e5831463e8dc851f048b0e3",
+    "kata-containers-3.19.1.kata2-cargo.tar.gz": "746026336cb94f857bc5f07ad1de3ac514b334a4afa53887390a88c967e971b4"
   }
 }

SPECS/cloud-hypervisor/cloud-hypervisor.signatures.json

@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name:           kata-containers
-Version:        3.19.1.kata1
+Version:        3.19.1.kata2
 Release:        1%{?dist}
 Summary:        Kata Containers package developed for Pod Sandboxing on AKS
 License:        ASL 2.0
@@ -115,6 +115,9 @@ popd
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service
 
 %changelog
+* Mon Sep 08 2025 CBL-Mariner Servicing Account <[email protected]> - 3.19.1.kata2-1
+- Auto-upgrade to 3.19.1.kata2
+
 * Wed Aug 27 2025 CBL-Mariner Servicing Account <[email protected]> - 3.19.1.kata1-1
 - Auto-upgrade to 3.19.1.kata1