Skip to content

Commit

Permalink
chore(core): update libvirt, qemu-kvm-core and edk2 packages
Browse files Browse the repository at this point in the history
kubevirt/kubevirt#12452

Signed-off-by: Roman Sysoev <[email protected]>
  • Loading branch information
Roman Sysoev committed Nov 24, 2024
1 parent eac0869 commit 6e84f1b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion images/libguestfs/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 12 additions & 10 deletions images/virt-launcher/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -103,24 +103,25 @@ shell:
apt-get update && apt-get install --yes \
acl \
pcre \
procps \
ethtool \
nftables \
xorriso \
passt \
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
Expand All @@ -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.
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 6e84f1b

Please sign in to comment.