Skip to content

Commit 4e3db2b

Browse files
tst import bins and libs
Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
1 parent c71e122 commit 4e3db2b

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

images/virt-launcher/werf.inc.yaml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -312,14 +312,23 @@ shell:
312312
echo "=====Copy qemu binaries to temp folder======"
313313
cp -a /qemu-bins/. /VBINS/
314314
315+
# install binaries from images
316+
cp -a /xorriso/. /
317+
cp -a /swtpm/. /
318+
cp -a /numactl/. /
319+
cp -a /gnutls/. /
320+
cp -a /dmidecode/. /
321+
cp -a /acl/. /
322+
315323
echo "find and copy additional libs"
316324
FILES=$(find /VBINS/usr/bin/ -type f)
317325
FILES+=" $(find /VBINS/usr/sbin/ -type f)"
318326
319-
LIBS="/usr/lib64/libbsd.so* /usr/lib64/libnbd.so* /usr/lib64/libfuse3.so*"
320-
LIBS+=" /usr/lib64/libjson-c.so* /usr/lib64/libssh.so* /usr/lib64/libssh2.so*"
327+
LIBS="/usr/lib64/libbsd.s* /usr/lib64/libnbd.s* /usr/lib64/libfuse3.s*"
328+
LIBS+=" /usr/lib64/libjson-c.s* /usr/lib64/libssh.s* /usr/lib64/libssh2.s*"
321329
LIBS+=" /usr/lib64/libtpms* /usr/lib64/libjson* /usr/lib64/libfuse*"
322-
LIBS+=" /usr/lib64/libxml2.so* /usr/lib64/libgcc_s* /usr/lib64/libaudit*"
330+
LIBS+=" /usr/lib64/libxml2.s* /usr/lib64/libgcc_s* /usr/lib64/libaudit*"
331+
LIBS+=" /usr/lib64/libisoburn.s*"
323332
324333
echo "Relocate additional libs for files in /VBINS"
325334
./relocate_binaries.sh -i "$FILES" -o /VBINS
@@ -329,13 +338,6 @@ shell:
329338
330339
cp -a /VBINS/. /relocate
331340
332-
cp -a /xorriso/. /
333-
cp -a /swtpm/. /
334-
cp -a /numactl/. /
335-
cp -a /gnutls/. /
336-
cp -a /dmidecode/. /
337-
cp -a /acl/. /
338-
339341
echo "Show libs after relocation in /relocate/usr/lib64"
340342
ls -la /relocate/usr/lib64
341343
# Cleanup

0 commit comments

Comments
 (0)