try import qemu imgs as dedicaded libs and bins

Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>

Author: universal-itengineer

images/cdi-importer/werf.inc.yaml

@@ -17,14 +17,14 @@ imageSpec:
 libraries:
 - libsqlite3
 packages:
-  - qemu-img
+  # - qemu-img
   - libnbd
   - nbd-client
   - nbd-server
 binaries:
   # Qemu-img
-  - /usr/bin/qemu-img
-  - /usr/bin/qemu-nbd
+  # - /usr/bin/qemu-img
+  # - /usr/bin/qemu-nbd
   # All nbd binaries
   - /usr/bin/nbd*
   # Mount
@@ -52,6 +52,10 @@ import:
   - cdi-image-size-detection
   - cdi-importer
   - cdi-source-update-poller
+- image: qemu
+  add: /qemu-img
+  to: /relocate
+  before: setup
 shell:
   install:
   - |

images/dvcr-artifact/werf.inc.yaml

@@ -35,8 +35,8 @@ shell:
 {{- define "$name" -}}
 binaries:
 - /usr/local/bin/dvcr-importer
-- /usr/bin/qemu-img
-- /usr/bin/qemu-nbd
+# - /usr/bin/qemu-img
+# - /usr/bin/qemu-nbd
 - /usr/bin/nbd*
 - /usr/bin/file
 - /usr/share/file/magic
@@ -58,11 +58,15 @@ import:
   add: /out
   to: /usr/local/bin
   before: setup
+- image: qemu
+  add: /qemu-img
+  to: /relocate
+  before: setup
 shell:
   install:
   - |
     apt-get update && apt-get install --yes \
-      qemu-img libnbd file
+      libnbd file
   - apt-get clean
   - rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
   setup:

images/virt-handler/werf.inc.yaml

@@ -53,11 +53,11 @@ imageSpec:
 packages:
 - acl
 - nftables
-- qemu-img
+# - qemu-img
 - xorriso
 binaries:
-- /usr/bin/qemu-img
-- /usr/bin/qemu-nbd
+# - /usr/bin/qemu-img
+# - /usr/bin/qemu-nbd
 - /usr/bin/mount
 - /usr/bin/umount
 - /usr/bin/getfacl
@@ -76,6 +76,11 @@ binaries:
 image: {{ $.ImageName }}-bins
 final: false
 fromImage: base-alt-p11-binaries
+import:
+- image: qemu
+  add: /qemu-img
+  to: /relocate
+  before: setup
 shell:
   install:
   - |