Skip to content

Commit 698e92b

Browse files
committed
fix: build
Signed-off-by: Daniil Antoshin <daniil.antoshin@flant.com>
1 parent e8f40d9 commit 698e92b

2 files changed

Lines changed: 13 additions & 8 deletions

File tree

images/virt-launcher/werf.inc.yaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ libs:
112112
- libtirpc-devel
113113
- libclocale
114114
- libLLVMSPIRVLib-devel
115-
- libswtpm-devel
116115
packages:
117116
- acl
118117
- attr
@@ -237,7 +236,12 @@ import:
237236

238237
- image: packages/binaries/swtpm
239238
add: /swtpm
240-
to: /
239+
to: /swtpm
240+
before: install
241+
242+
- image: packages/binaries/numactl
243+
add: /numactl
244+
to: /numctl
241245
before: install
242246

243247
- image: tools/coreutils
@@ -255,17 +259,13 @@ import:
255259
before: setup
256260
includePaths:
257261
- temp_pod
258-
- image: packages/binaries/numactl
259-
add: /numactl
260-
to: /
261-
before: install
262262
shell:
263263
beforeInstall:
264264
- |
265265
apt-get update && apt-get install -y {{ $virtLauncherDependencies.libs | join " " }} {{ $virtLauncherDependencies.packages | join " " }}
266266
267267
# libtpms libtpms-devel require version 0.10 that in sisyphus repo
268-
cat >/etc/apt/sources.list.d/alt-sisyphus.list<<EOF
268+
cat >/etc/apt/sources.list.d/alt-sisyphus.list<<EOF
269269
rpm [alt] http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus x86_64 classic
270270
rpm [alt] http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus noarch classic
271271
EOF
@@ -281,6 +281,7 @@ shell:
281281
echo "Create folder hierarchy in VBINS"
282282
mkdir -p /VBINS/{etc,root}
283283
mkdir -p /VBINS/var/{log/libvirt/qemu,log/swtpm/libvirt/qemu,lib/libvirt/qemu,run/libvirt/qemu}
284+
mkdir -p /VBINS/usr/lib64/swtpm
284285
285286
echo "=====Copy libvirt binaries to temp folder======"
286287
cp -a /libvirt-bins/. /VBINS/
@@ -305,10 +306,13 @@ shell:
305306
306307
cp -a /VBINS/. /relocate
307308
309+
cp -a /swtpm/. /
310+
cp -a /numactl/. /
311+
308312
echo "Show libs after relocation in /relocate/usr/lib64"
309313
ls -la /relocate/usr/lib64
310314
# Cleanup
311-
rm -rf /{VBINS,qemu-bins,libvirt-bins}
315+
rm -rf /{VBINS,qemu-bins,libvirt-bins,swtpm,numactl}
312316
313317
setup:
314318
- |

images/virtualization-artifact/pkg/common/kvvm/kvvm.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ func DeletePodByKVVMI(ctx context.Context, cli client.Client, kvvmi *virtv1.Virt
9797
if pod == nil {
9898
return nil
9999
}
100+
100101
return object.DeleteObject(ctx, cli, pod, opts)
101102
}
102103

0 commit comments

Comments
 (0)