kata-containers: adapt for msft-main sources

* Requires the new Rust virtiosfd 1.8.0. * Removes all patches. See microsoft/kata-containers#122 (comment) for a discussion. Since then, the memory patch was included in msft-main and patch 0004 is included in microsoft/kata-containers#154. * Cleans up runtime make flags: * The following were redundant as we were setting the default: * DEFSHAREDFS * DEFVIRTIOFSCACHESIZE * DEFSANDBOXCGROUPONLY * DEFSTATICRESOURCEMGMT_CLH
microsoft · Jan 24, 2024 · 3daa9ec · 3daa9ec
1 parent 889a87f
commit 3daa9ec
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 629 deletions.
diff --git a/SPECS/kata-containers/0001-Append-systemd-kernel-cmdline-params-for-initrd.patch b/SPECS/kata-containers/0001-Append-systemd-kernel-cmdline-params-for-initrd.patch
diff --git a/SPECS/kata-containers/0001-Merged-PR-9607-Allow-10-seconds-for-VM-creation-star.patch b/SPECS/kata-containers/0001-Merged-PR-9607-Allow-10-seconds-for-VM-creation-star.patch
diff --git a/SPECS/kata-containers/0001-osbuilder-Add-support-for-CBL-Mariner.patch b/SPECS/kata-containers/0001-osbuilder-Add-support-for-CBL-Mariner.patch
diff --git a/SPECS/kata-containers/0002-Merged-PR-9671-Wait-for-a-possibly-slow-Guest.patch b/SPECS/kata-containers/0002-Merged-PR-9671-Wait-for-a-possibly-slow-Guest.patch
diff --git a/SPECS/kata-containers/0003-Merged-PR-9805-Add-support-for-MSHV.patch b/SPECS/kata-containers/0003-Merged-PR-9805-Add-support-for-MSHV.patch
diff --git a/SPECS/kata-containers/0004-Merged-PR-9806-Fix-enable_debug-for-hypervisor.clh.patch b/SPECS/kata-containers/0004-Merged-PR-9806-Fix-enable_debug-for-hypervisor.clh.patch
diff --git a/SPECS/kata-containers/0005-Merged-PR-9956-shim-avoid-memory-hotplug-timeout.patch b/SPECS/kata-containers/0005-Merged-PR-9956-shim-avoid-memory-hotplug-timeout.patch
diff --git a/SPECS/kata-containers/drop-mut-for-variables-that-are-not-mutated.patch b/SPECS/kata-containers/drop-mut-for-variables-that-are-not-mutated.patch
diff --git a/SPECS/kata-containers/kata-containers.spec b/SPECS/kata-containers/kata-containers.spec
@@ -24,11 +24,8 @@
 %global runtime_make_vars       QEMUPATH=%{qemupath} \\\
                                 KERNELTYPE="compressed" \\\
                                 KERNELPARAMS="systemd.legacy_systemd_cgroup_controller=yes systemd.unified_cgroup_hierarchy=0" \\\
-                                # DEFSHAREDFS="virtio-fs" \\\ # default DEFSHAREDFS_CLH_VIRTIOFS=virtio-fs
                                 DEFVIRTIOFSDAEMON=%{_libexecdir}/"virtiofsd-rs" \\\
-                                # DEFVIRTIOFSCACHESIZE=0 \\\ # default 0
-                                # DEFSANDBOXCGROUPONLY=false \\\ # default false
-                                DEFSTATICRESOURCEMGMT_CLH=true # false by default upstream
+                                DEFSTATICRESOURCEMGMT_CLH=true \\\
                                 DEFSTATICSANDBOXWORKLOADMEM=1792 \\\
                                 DEFMEMSZ=256 \\\
                                 SKIP_GO_VERSION_CHECK=y \\\
@@ -81,7 +78,9 @@ BuildRequires:  rust
 Requires:       busybox
 Requires:       kernel
 Requires:       libseccomp
-Requires:       virtiofsd
+# Must match the version specified by the `assets.virtiofsd.version` field in
+# %{SOURCE0}/versions.yaml.
+Requires:       virtiofsd = 1.8.0
 
 Conflicts:      kata-agent
 Conflicts:      kata-ksm-throttler