From 905dbe70d31f7f59665dd7788f90ab9afa4f8c39 Mon Sep 17 00:00:00 2001
From: Nikita Korolev <nikita.korolev@flant.com>
Date: Mon, 21 Apr 2025 12:36:15 +0300
Subject: [PATCH 1/3] fix(core): add missing libs for swtpm

Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
---
 images/virt-launcher/werf.inc.yaml | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml
index e41b938008..7bee9bd11a 100644
--- a/images/virt-launcher/werf.inc.yaml
+++ b/images/virt-launcher/werf.inc.yaml
@@ -146,6 +146,8 @@ binaries:
   - /usr/bin/openssl
   # Xorriso (Creates an image of an ISO9660 filesystem)
   - /usr/bin/xorriso-dd-target /usr/bin/xorrisofs
+  # Swtpm
+  - /usr/bin/swtpm /usr/bin/swtpm_bios /usr/bin/swtpm_cert /usr/bin/swtpm_ioctl /usr/bin/swtpm_localca /usr/bin/swtpm_setup
   # Dmidecode
   - /usr/sbin/biosdecode /usr/sbin/dmidecode
   # Numactl
@@ -234,10 +236,12 @@ import:
   includePaths:
   - node-labeller
   - vlctl
+
 - image: packages/binaries/swtpm
   add: /swtpm
-  to: /relocate
-  after: setup
+  to: /
+  before: install
+
 - image: tools/coreutils
   add: /
   to: /relocate
@@ -258,7 +262,19 @@ shell:
   - |
     apt-get update && apt-get install -y {{ $virtLauncherDependencies.libs | join " " }} {{ $virtLauncherDependencies.packages | join " " }}
 
+    # libtpms libtpms-devel require version 0.10 that in sisyphus repo
+    cat >/etc/apt/sources.list.d/alt-sisyphus.list<<EOF 
+    rpm [alt] http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus x86_64 classic
+    rpm [alt] http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus noarch classic
+    EOF
+
+    apt-get update
+    apt-get install -y libtpms-devel
+    rm -f /etc/apt/sources.list.d/alt-sisyphus.list
+
+    apt-get update
     apt-get clean
+    rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
   install:
   - |
     echo "Create folder hierarchy in VBINS"
@@ -277,7 +293,7 @@ shell:
     
     LIBS="/usr/lib64/libbsd.so* /usr/lib64/libnbd.so* /usr/lib64/libfuse3.so*"
     LIBS+=" /usr/lib64/libjson-c.so* /usr/lib64/libssh.so* /usr/lib64/libssh2.so*"
-    LIBS+=" /usr/lib64/libtpms.so*"
+    LIBS+=" /usr/lib64/libtpms* /usr/lib64/libjson* /usr/lib64/libfuse*"
     LIBS+=" /usr/lib64/libxml2.so* /usr/lib64/libgcc_s*"
 
     echo "Relocate additional libs for files in /VBINS"
@@ -297,6 +313,9 @@ shell:
   - |
     ./relocate_binaries.sh -i "{{ $virtLauncherDependencies.binaries | join " " }}" -o /relocate
 
+    echo "Copy additional config swtpm"
+    cp -a /etc/{swtpm_setup.conf,swtpm-localca.conf,swtpm-localca.options} /relocate/etc/
+
     echo "Copy xattr config"
     cp -a /etc/xattr.conf /relocate/etc
 

From 5f24a3f10230bef88fe65e6ab8a1ec216451085b Mon Sep 17 00:00:00 2001
From: Nikita Korolev <nikita.korolev@flant.com>
Date: Tue, 22 Apr 2025 10:31:23 +0300
Subject: [PATCH 2/3] remove unnecessary apt-get update in before install stage

Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
---
 images/virt-launcher/werf.inc.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml
index 7bee9bd11a..8c07e82dd3 100644
--- a/images/virt-launcher/werf.inc.yaml
+++ b/images/virt-launcher/werf.inc.yaml
@@ -272,7 +272,6 @@ shell:
     apt-get install -y libtpms-devel
     rm -f /etc/apt/sources.list.d/alt-sisyphus.list
 
-    apt-get update
     apt-get clean
     rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
   install:

From 1214aa305f51464d36c7b8433e9275a869c005ca Mon Sep 17 00:00:00 2001
From: Nikita Korolev <nikita.korolev@flant.com>
Date: Tue, 22 Apr 2025 10:39:50 +0300
Subject: [PATCH 3/3] chnage libtpms-devel to libtpms

Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
---
 images/virt-launcher/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml
index 8c07e82dd3..074649323e 100644
--- a/images/virt-launcher/werf.inc.yaml
+++ b/images/virt-launcher/werf.inc.yaml
@@ -269,7 +269,7 @@ shell:
     EOF
 
     apt-get update
-    apt-get install -y libtpms-devel
+    apt-get install -y libtpms
     rm -f /etc/apt/sources.list.d/alt-sisyphus.list
 
     apt-get clean