Skip to content

Commit aa921f0

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

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

images/virt-launcher/werf.inc.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,12 @@ import:
237237

238238
- image: packages/binaries/swtpm
239239
add: /swtpm
240-
to: /
240+
to: /swtpm
241+
before: install
242+
243+
- image: packages/binaries/numactl
244+
add: /numactl
245+
to: /numctl
241246
before: install
242247

243248
- image: tools/coreutils
@@ -255,17 +260,13 @@ import:
255260
before: setup
256261
includePaths:
257262
- temp_pod
258-
- image: packages/binaries/numactl
259-
add: /numactl
260-
to: /
261-
before: install
262263
shell:
263264
beforeInstall:
264265
- |
265266
apt-get update && apt-get install -y {{ $virtLauncherDependencies.libs | join " " }} {{ $virtLauncherDependencies.packages | join " " }}
266267
267268
# libtpms libtpms-devel require version 0.10 that in sisyphus repo
268-
cat >/etc/apt/sources.list.d/alt-sisyphus.list<<EOF
269+
cat >/etc/apt/sources.list.d/alt-sisyphus.list<<EOF
269270
rpm [alt] http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus x86_64 classic
270271
rpm [alt] http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus noarch classic
271272
EOF
@@ -281,6 +282,7 @@ shell:
281282
echo "Create folder hierarchy in VBINS"
282283
mkdir -p /VBINS/{etc,root}
283284
mkdir -p /VBINS/var/{log/libvirt/qemu,log/swtpm/libvirt/qemu,lib/libvirt/qemu,run/libvirt/qemu}
285+
mkdir -p /VBINS/usr/lib64/swtpm
284286
285287
echo "=====Copy libvirt binaries to temp folder======"
286288
cp -a /libvirt-bins/. /VBINS/
@@ -305,10 +307,13 @@ shell:
305307
306308
cp -a /VBINS/. /relocate
307309
310+
cp -an /swtpm/. /
311+
cp -an /numactl/. /
312+
308313
echo "Show libs after relocation in /relocate/usr/lib64"
309314
ls -la /relocate/usr/lib64
310315
# Cleanup
311-
rm -rf /{VBINS,qemu-bins,libvirt-bins}
316+
rm -rf /{VBINS,qemu-bins,libvirt-bins,swtpm,numactl}
312317
313318
setup:
314319
- |

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)