From 6e84f1bd9bddaee29db3e3fcd60ecbccc2d7a9d9 Mon Sep 17 00:00:00 2001
From: Roman Sysoev <roman.sysoev@flant.com>
Date: Tue, 19 Nov 2024 21:47:33 +0300
Subject: [PATCH] chore(core): update libvirt, qemu-kvm-core and edk2 packages

https://github.com/kubevirt/kubevirt/pull/12452

Signed-off-by: Roman Sysoev <roman.sysoev@flant.com>
---
 images/libguestfs/werf.inc.yaml    |  2 +-
 images/virt-launcher/werf.inc.yaml | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/images/libguestfs/werf.inc.yaml b/images/libguestfs/werf.inc.yaml
index 9a027fa49..a387acb02 100644
--- a/images/libguestfs/werf.inc.yaml
+++ b/images/libguestfs/werf.inc.yaml
@@ -28,7 +28,7 @@ shell:
     acl \
     seabios \
     edk2-ovmf \
-    libvirt-daemon-driver-qemu==10.2.0-alt1 \
+    libvirt-daemon-driver-qemu==10.7.0-alt1 \
     qemu-kvm-core==9.0.2-alt2 \
     libguestfs==1.52.0-alt2 \
     guestfs-tools==1.52.0-alt1
diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml
index 974f934a6..a6048985a 100644
--- a/images/virt-launcher/werf.inc.yaml
+++ b/images/virt-launcher/werf.inc.yaml
@@ -9,7 +9,7 @@ import:
   to: /
   before: install
   includePaths:
-  - edk2-ovmf-20231115-alt1.noarch.rpm
+  - edk2-ovmf-20240811-alt2.noarch.rpm
 
 # After install stage.
 #  Add libxcrypto library.
@@ -103,6 +103,7 @@ shell:
     apt-get update && apt-get install --yes \
     acl \
     pcre \
+    procps \
     ethtool \
     nftables \
     xorriso \
@@ -110,17 +111,17 @@ shell:
     seabios \
     libffi8 \
     swtpm-tools \
-    libvirt-client==10.2.0-alt1 \
-    libvirt-daemon-driver-qemu==10.2.0-alt1 \
-    qemu-kvm-core==9.0.2-alt2
+    libvirt-client==10.7.0-alt1 \
+    libvirt-daemon-driver-qemu==10.7.0-alt1 \
+    qemu-kvm-core==9.0.2-alt3
   - apt-get clean
   - rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
   install:
   # Upgrade edk2-ovmf package to custom build and remove its package.
   - |
-    rpm -Uv /edk2-ovmf-20231115-alt1.noarch.rpm
-    rm /edk2-ovmf-20231115-alt1.noarch.rpm
-  # Restructure firware files in /usr/share/OVMF to mimic structure
+    rpm -Uv /edk2-ovmf-20240811-alt2.noarch.rpm
+    rm /edk2-ovmf-20240811-alt2.noarch.rpm
+  # Restructure firmware files in /usr/share/OVMF to mimic structure
   # in edk2-ovmf package from the original kubevirt.
   - |
     cd /usr/share/OVMF
@@ -137,10 +138,10 @@ shell:
     rm OVMF_VARS.secboot.fd
     mv OVMF_VARS_4M.fd OVMF_VARS.fd
     rm OVMF_VARS_4M.ms.fd
-    rm OVMF_VARS_4M.ms.qcow2
-    rm OVMF_VARS_4M.qcow2
+    rm OVMF_VARS_4M.ms.qcow2 || true
+    rm OVMF_VARS_4M.qcow2 || true
     mv OVMF_VARS_4M.secboot.fd OVMF_VARS.secboot.fd
-    rm OVMF_VARS_4M.secboot.qcow2
+    rm OVMF_VARS_4M.secboot.qcow2 || true
     ls -la
   setup:
   # Replace virt-launcher-monitor with the wrapper.
@@ -229,6 +230,7 @@ shell:
 ---
 # Note: edk2-ovmf==20231115 requires p11 AltLinux to build.
 image: {{ $.ImageName }}-edk2-builder
+fromCacheVersion: "edk2-ovmf-20240811-alt2.noarch"
 final: false
 from: {{ $.Images.BASE_ALT_P11 }}
 git: