Skip to content

Commit f39933b

Browse files
tmp: remove libvirt/var
Signed-off-by: Anton Fomichev <anton.fomichev@flant.com>
1 parent 80dc526 commit f39933b

3 files changed

Lines changed: 28 additions & 24 deletions

File tree

images/packages/libvirt/werf.inc.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
1212
final: false
1313
fromImage: builder/distroless
1414
shell:
15+
beforeInstall:
16+
- pm info libvirt
17+
- pm info libvirt-devel
18+
- pm info -L libvirt
19+
- pm info -L libvirt-devel
1520
install:
1621
- pm --version
1722
- pm install -1 {{ .ImageName }} {{ .ImageName }}-devel -d /out

images/virt-artifact/werf.inc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ shell:
7171
- |
7272
# Install packages
7373
PKGS="{{ $builderDependencies.packages | join " " }}"
74-
ls /libvirt -la
7574
for pkg in $PKGS; do
7675
cp -a /$pkg/. /
7776
rm -rf /$pkg

images/virt-launcher/werf.inc.yaml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -358,29 +358,29 @@ shell:
358358
359359
echo "libvirt_version: $libvirt_version"
360360
361-
SYMLINC_LIST=$(cat <<EOF
362-
libvirt.so.0.${libvirt_version}.0 libvirt.so.0
363-
libvirt.so.0 libvirt.so
364-
libvirt-qemu.so.0.${libvirt_version}.0 libvirt-qemu.so.0
365-
libvirt-qemu.so.0 libvirt-qemu.so
366-
libvirt-lxc.so.0.${libvirt_version}.0 libvirt-lxc.so.0
367-
libvirt-lxc.so.0 libvirt-lxc.so
368-
libvirt-admin.so.0.${libvirt_version}.0 libvirt-admin.so.0
369-
libvirt-admin.so.0 libvirt-admin.so
370-
EOF
371-
)
372-
373-
cd /relocate
374-
375-
while IFS= read -r LINE; do
376-
echo "Create symlinc for $LINE"
377-
TARGET=$(echo $LINE | awk -F' ' '{print $1}')
378-
SYMLINK=$(echo $LINE | awk -F' ' '{print $2}')
379-
ln -s ../local/lib64/$TARGET usr/lib64/$SYMLINK
380-
done <<< "$SYMLINC_LIST"
381-
382-
echo "List files in /relocate/usr/local/lib64"
383-
ls -la usr/local/lib64
361+
#SYMLINC_LIST=$(cat <<EOF
362+
#libvirt.so.0.${libvirt_version}.0 libvirt.so.0
363+
#libvirt.so.0 libvirt.so
364+
#libvirt-qemu.so.0.${libvirt_version}.0 libvirt-qemu.so.0
365+
#libvirt-qemu.so.0 libvirt-qemu.so
366+
#libvirt-lxc.so.0.${libvirt_version}.0 libvirt-lxc.so.0
367+
#libvirt-lxc.so.0 libvirt-lxc.so
368+
#libvirt-admin.so.0.${libvirt_version}.0 libvirt-admin.so.0
369+
#libvirt-admin.so.0 libvirt-admin.so
370+
#EOF
371+
#)
372+
373+
#cd /relocate
374+
375+
#while IFS= read -r LINE; do
376+
# echo "Create symlinc for $LINE"
377+
# TARGET=$(echo $LINE | awk -F' ' '{print $1}')
378+
# SYMLINK=$(echo $LINE | awk -F' ' '{print $2}')
379+
# ln -fs ../local/lib64/$TARGET usr/lib64/$SYMLINK
380+
#done <<< "$SYMLINC_LIST"
381+
382+
#echo "List files in /relocate/usr/local/lib64"
383+
#ls -la usr/local/lib64
384384
385385
- |
386386
cd /relocate

0 commit comments

Comments
 (0)