From 15306189d8d1f6d051b467e9de9169a986482566 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 11:23:27 +0300
Subject: [PATCH 01/45] refactor(core): build nbd

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 74 ++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 images/packages/binaries/nbd/werf.inc.yaml

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
new file mode 100644
index 0000000000..2299b86aa0
--- /dev/null
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -0,0 +1,74 @@
+---
+image: {{ $.ImageType }}/{{ $.ImageName }}
+final: false
+fromImage: builder/scratch
+import:
+- image: {{ $.ImageType }}/{{ $.ImageName }}-builder
+  add: /out
+  to: /nbd
+  before: setup
+
+---
+{{- $version := get $.Package $.ImageName }}
+{{- $gitRepoUrl := "networkblockdevice/nbd.git" }}
+
+{{- $name := print $.ImageName "-dependencies" -}}
+{{- define "$name" -}}
+packages:
+- expect socat twisted-core-tools gcc
+- git pkg-config trousers
+- automake autoconf make libtool
+- openssl cryptote
+- net-tools softhsm
+- tpm2-pkcs11 tpm2-pkcs11-tools tpm2-tools tpm2-abrmd
+- glib2-devel libgnutls-openssl-devel libssl-devel
+- libgnutls30 libfuse-devel libgnutls-devel gnutls-utils
+- libtasn1 libtasn1-devel libjson-glib-devel
+- libseccomp-devel libseccomp
+- libgmp-devel
+- perl-podlators
+{{- end -}}
+
+{{ $builderDependencies := include "$name" . | fromYaml }}
+
+image: {{ $.ImageType }}/{{ $.ImageName }}-builder
+final: false
+fromImage: builder/alt
+secrets:
+- id: SOURCE_REPO
+  value: {{ $.SOURCE_REPO_GIT }}
+shell:
+  beforeInstall:
+    - |
+      apt-get update && apt-get install -y \
+        {{ $builderDependencies.packages | join " " }}
+      
+      apt-get update
+      apt-get clean
+      rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
+
+  install:
+    - |
+      OUTDIR=/out
+      mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
+      
+      git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /src
+      cd /src
+      
+      ./autogen.sh \
+        --disable-tests \
+        --with-gnutls \
+        --prefix=/usr \
+        --enable-lfs \
+        --enable-syslog \
+        # --libdir=/usr/lib64
+      
+      make -j$(nproc)
+      
+      make DESTDIR=$OUTDIR install
+      strip $OUTDIR/usr/bin/*
+
+      # We don't need man, test and samples files
+      rm -rf $OUTDIR/usr/include
+      rm -rf $OUTDIR/usr/share
+      rm -rf $OUTDIR/usr/libexec/installed-tests

From 499a63216d623da771438cd9d14ead2e60dcec78 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 11:37:02 +0300
Subject: [PATCH 02/45] add nbd version

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 component_versions/version_map.yml         | 1 +
 images/packages/binaries/nbd/werf.inc.yaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/component_versions/version_map.yml b/component_versions/version_map.yml
index ccea56a382..f747ba0e19 100644
--- a/component_versions/version_map.yml
+++ b/component_versions/version_map.yml
@@ -7,3 +7,4 @@ package:
   xorriso: 1.5.6
   numactl: 2.0.19
   openssl: openssl-3.4.1
+  nbd: 3.26.1
diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index 2299b86aa0..64d6a5e116 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -52,7 +52,7 @@ shell:
       OUTDIR=/out
       mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
       
-      git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /src
+      git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch nbd-{{ $version }} /src
       cd /src
       
       ./autogen.sh \

From cd6e69fb7bd66452d8ec08c84d11f9677e7edbd2 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 16:15:58 +0300
Subject: [PATCH 03/45] install autoconf-archive

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index 64d6a5e116..9deb6a7f10 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -17,7 +17,7 @@ import:
 packages:
 - expect socat twisted-core-tools gcc
 - git pkg-config trousers
-- automake autoconf make libtool
+- automake autoconf-archive make libtool
 - openssl cryptote
 - net-tools softhsm
 - tpm2-pkcs11 tpm2-pkcs11-tools tpm2-tools tpm2-abrmd
@@ -42,7 +42,7 @@ shell:
     - |
       apt-get update && apt-get install -y \
         {{ $builderDependencies.packages | join " " }}
-      
+
       apt-get update
       apt-get clean
       rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
@@ -51,10 +51,10 @@ shell:
     - |
       OUTDIR=/out
       mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
-      
+
       git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch nbd-{{ $version }} /src
       cd /src
-      
+
       ./autogen.sh \
         --disable-tests \
         --with-gnutls \
@@ -62,9 +62,9 @@ shell:
         --enable-lfs \
         --enable-syslog \
         # --libdir=/usr/lib64
-      
+
       make -j$(nproc)
-      
+
       make DESTDIR=$OUTDIR install
       strip $OUTDIR/usr/bin/*
 

From 34e54e600c41d75d9b7d26163bfa6788a72643e5 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 16:25:29 +0300
Subject: [PATCH 04/45] add configure step

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index 9deb6a7f10..0435ebb47b 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -63,6 +63,8 @@ shell:
         --enable-syslog \
         # --libdir=/usr/lib64
 
+      ./configure
+
       make -j$(nproc)
 
       make DESTDIR=$OUTDIR install

From 97571b4e03184f836754d27989a545e781e15be8 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 16:36:58 +0300
Subject: [PATCH 05/45] cleanup packages and options (possibly destructive)

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index 0435ebb47b..a72c25ea9c 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -15,18 +15,9 @@ import:
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
 packages:
-- expect socat twisted-core-tools gcc
-- git pkg-config trousers
-- automake autoconf-archive make libtool
-- openssl cryptote
-- net-tools softhsm
-- tpm2-pkcs11 tpm2-pkcs11-tools tpm2-tools tpm2-abrmd
-- glib2-devel libgnutls-openssl-devel libssl-devel
-- libgnutls30 libfuse-devel libgnutls-devel gnutls-utils
-- libtasn1 libtasn1-devel libjson-glib-devel
-- libseccomp-devel libseccomp
-- libgmp-devel
-- perl-podlators
+- git gcc
+- automake autoconf-archive make
+- glib2-devel bison flex setproctitle
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -57,10 +48,10 @@ shell:
 
       ./autogen.sh \
         --disable-tests \
-        --with-gnutls \
         --prefix=/usr \
         --enable-lfs \
         --enable-syslog \
+        --disable-manpages
         # --libdir=/usr/lib64
 
       ./configure

From 8990a87b869931daed37b061da73a7ee15731312 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 16:39:03 +0300
Subject: [PATCH 06/45] add libtool

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index a72c25ea9c..9224a5f05d 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -16,7 +16,7 @@ import:
 {{- define "$name" -}}
 packages:
 - git gcc
-- automake autoconf-archive make
+- automake autoconf-archive make libtool
 - glib2-devel bison flex setproctitle
 {{- end -}}
 

From 7e0c7e97158990f1a9d5596a9d167fbb29433a94 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 16:59:08 +0300
Subject: [PATCH 07/45] add makeinfo and pkg-config

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index 9224a5f05d..e17dc1accf 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -16,7 +16,7 @@ import:
 {{- define "$name" -}}
 packages:
 - git gcc
-- automake autoconf-archive make libtool
+- automake autoconf-archive make libtool makeinfo pkg-config
 - glib2-devel bison flex setproctitle
 {{- end -}}
 

From d36e3fea8d96813532b191a97e82153f8b534ade Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 17:04:50 +0300
Subject: [PATCH 08/45] libnl & dockbook

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index e17dc1accf..f8df80ef4d 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -16,8 +16,8 @@ import:
 {{- define "$name" -}}
 packages:
 - git gcc
-- automake autoconf-archive make libtool makeinfo pkg-config
-- glib2-devel bison flex setproctitle
+- automake autoconf-archive make libtool
+- glib2-devel bison flex setproctitle libnl-devel docbook-utils
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}

From 88d345c0dfcb2aa5609da1cf8579f4e67f02cd60 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 17:30:26 +0300
Subject: [PATCH 09/45] move opts to configure

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index f8df80ef4d..07369d7510 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -46,15 +46,15 @@ shell:
       git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch nbd-{{ $version }} /src
       cd /src
 
-      ./autogen.sh \
+      ./autogen.sh
+        # --libdir=/usr/lib64
+
+      ./configure \
         --disable-tests \
         --prefix=/usr \
         --enable-lfs \
         --enable-syslog \
         --disable-manpages
-        # --libdir=/usr/lib64
-
-      ./configure
 
       make -j$(nproc)
 

From 722dba4cb57413de15fbc99def09aefa6c8a9737 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 17:32:39 +0300
Subject: [PATCH 10/45] remove disable tests

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index 07369d7510..de37398cc8 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -50,7 +50,6 @@ shell:
         # --libdir=/usr/lib64
 
       ./configure \
-        --disable-tests \
         --prefix=/usr \
         --enable-lfs \
         --enable-syslog \

From cb6def539b753d6433de254284357a25c8f47dd4 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 17:35:28 +0300
Subject: [PATCH 11/45] debug

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index de37398cc8..a7d2d563c1 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -48,16 +48,17 @@ shell:
 
       ./autogen.sh
         # --libdir=/usr/lib64
-
-      ./configure \
         --prefix=/usr \
         --enable-lfs \
         --enable-syslog \
         --disable-manpages
 
+      ./configure
+
       make -j$(nproc)
 
       make DESTDIR=$OUTDIR install
+      ls $OUTDIR/usr/bin
       strip $OUTDIR/usr/bin/*
 
       # We don't need man, test and samples files

From 01c8ff1f98505aa4f6bd75334b9f6210454e2ed7 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 17:41:59 +0300
Subject: [PATCH 12/45] escape newline in autogen.sh

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index a7d2d563c1..0a18f02394 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -46,8 +46,7 @@ shell:
       git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch nbd-{{ $version }} /src
       cd /src
 
-      ./autogen.sh
-        # --libdir=/usr/lib64
+      ./autogen.sh \
         --prefix=/usr \
         --enable-lfs \
         --enable-syslog \

From 40cbaf07cb99cb3a82afb9628a073ef1829a2231 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 17:44:44 +0300
Subject: [PATCH 13/45] debug 2: electric boogaloo

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index 0a18f02394..c861c8c371 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -57,6 +57,8 @@ shell:
       make -j$(nproc)
 
       make DESTDIR=$OUTDIR install
+      ls $OUTDIR/
+      ls $OUTDIR/usr
       ls $OUTDIR/usr/bin
       strip $OUTDIR/usr/bin/*
 

From b97a4c5bec9028815568351a2336a48b428305bf Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 17:55:18 +0300
Subject: [PATCH 14/45] move options again

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index c861c8c371..95a0bd29e1 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -46,20 +46,17 @@ shell:
       git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch nbd-{{ $version }} /src
       cd /src
 
-      ./autogen.sh \
+      ./autogen.sh
+
+      ./configure \
         --prefix=/usr \
         --enable-lfs \
         --enable-syslog \
         --disable-manpages
 
-      ./configure
-
       make -j$(nproc)
 
       make DESTDIR=$OUTDIR install
-      ls $OUTDIR/
-      ls $OUTDIR/usr
-      ls $OUTDIR/usr/bin
       strip $OUTDIR/usr/bin/*
 
       # We don't need man, test and samples files

From fe4553d357da2121ca62e00527ffc9e96cb7bf37 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 21 Apr 2025 17:59:36 +0300
Subject: [PATCH 15/45] comment out manpages

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index 95a0bd29e1..35d8b66545 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -52,7 +52,7 @@ shell:
         --prefix=/usr \
         --enable-lfs \
         --enable-syslog \
-        --disable-manpages
+        # --disable-manpages
 
       make -j$(nproc)
 

From 7e3d56c1a656e1185c6a6dcf89b7691762b830e0 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Tue, 22 Apr 2025 18:07:09 +0300
Subject: [PATCH 16/45] add musl

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index 35d8b66545..e488dab222 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -15,7 +15,8 @@ import:
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
 packages:
-- git gcc
+- git
+- gcc musl-dev musl-tools
 - automake autoconf-archive make libtool
 - glib2-devel bison flex setproctitle libnl-devel docbook-utils
 {{- end -}}
@@ -52,6 +53,7 @@ shell:
         --prefix=/usr \
         --enable-lfs \
         --enable-syslog \
+        CC=musl-gcc LDFLAGS=-static
         # --disable-manpages
 
       make -j$(nproc)

From 75f188278582efee05d93593c8bb896d7048a28a Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Tue, 22 Apr 2025 18:10:33 +0300
Subject: [PATCH 17/45] fix packages

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index e488dab222..b7d67ec90f 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -16,7 +16,7 @@ import:
 {{- define "$name" -}}
 packages:
 - git
-- gcc musl-dev musl-tools
+- gcc musl-devel
 - automake autoconf-archive make libtool
 - glib2-devel bison flex setproctitle libnl-devel docbook-utils
 {{- end -}}

From 98f820bc6da6a9a4a88be76d79570d0c5a4937b3 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Tue, 22 Apr 2025 18:15:25 +0300
Subject: [PATCH 18/45] debug 3

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index b7d67ec90f..cf993cb9f6 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -53,7 +53,7 @@ shell:
         --prefix=/usr \
         --enable-lfs \
         --enable-syslog \
-        CC=musl-gcc LDFLAGS=-static
+        CC=musl-gcc LDFLAGS=-static || cat config.log
         # --disable-manpages
 
       make -j$(nproc)

From 79232acc79fddfc3f0763e1ca82e71e2eb0e4a63 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Thu, 24 Apr 2025 14:43:58 +0300
Subject: [PATCH 19/45] return to shared build

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index cf993cb9f6..35d8b66545 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -15,8 +15,7 @@ import:
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
 packages:
-- git
-- gcc musl-devel
+- git gcc
 - automake autoconf-archive make libtool
 - glib2-devel bison flex setproctitle libnl-devel docbook-utils
 {{- end -}}
@@ -53,7 +52,6 @@ shell:
         --prefix=/usr \
         --enable-lfs \
         --enable-syslog \
-        CC=musl-gcc LDFLAGS=-static || cat config.log
         # --disable-manpages
 
       make -j$(nproc)

From c1ee9bc5a5331dfe5a877c35bc74cadc901aae4c Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Thu, 24 Apr 2025 15:23:41 +0300
Subject: [PATCH 20/45] add binaries to cdi-importer

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/cdi-importer/werf.inc.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml
index dc47d29431..9a8ff1b32d 100644
--- a/images/cdi-importer/werf.inc.yaml
+++ b/images/cdi-importer/werf.inc.yaml
@@ -26,7 +26,7 @@ binaries:
   # Mount
   - /usr/bin/mount /usr/bin/umount
   # Sqlite libs
-  - /usr/lib64/libsqlite3.so.0 
+  - /usr/lib64/libsqlite3.so.0
   # Block device binaries
   - /usr/sbin/blockdev
   # CDI binaries
@@ -52,6 +52,10 @@ import:
   add: /qemu-img
   to: /relocate
   before: setup
+- image: packages/binaries/nbd
+  add: /nbd
+  to: /relocate
+  after: setup
 shell:
   install:
   - |

From ff553625566f3b85ef22eaf498d01eab0c5cfc9e Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Thu, 24 Apr 2025 15:39:03 +0300
Subject: [PATCH 21/45] fix cdi-importer

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/cdi-importer/werf.inc.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml
index 9a8ff1b32d..c90b308701 100644
--- a/images/cdi-importer/werf.inc.yaml
+++ b/images/cdi-importer/werf.inc.yaml
@@ -18,8 +18,6 @@ libraries:
 - libsqlite3
 packages:
   - libnbd
-  - nbd-client
-  - nbd-server
 binaries:
   # All nbd binaries
   - /usr/bin/nbd*
@@ -54,7 +52,7 @@ import:
   before: setup
 - image: packages/binaries/nbd
   add: /nbd
-  to: /relocate
+  to: /
   after: setup
 shell:
   install:

From df30e89f9f29827a29ea005e36002ec7d6ed1308 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Thu, 24 Apr 2025 16:56:36 +0300
Subject: [PATCH 22/45] add cp -a step

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/cdi-importer/werf.inc.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml
index c90b308701..59465a8a6d 100644
--- a/images/cdi-importer/werf.inc.yaml
+++ b/images/cdi-importer/werf.inc.yaml
@@ -52,7 +52,7 @@ import:
   before: setup
 - image: packages/binaries/nbd
   add: /nbd
-  to: /
+  to: /nbd
   after: setup
 shell:
   install:
@@ -64,4 +64,5 @@ shell:
   - rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
   setup:
   - |
+    cp -a /nbd/. /
     /relocate_binaries.sh -i "{{ $cdiImporterDependencies.binaries | join " " }}" -o /relocate

From 56134d079393f252087acaf31b60e8f2fb1add1d Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Thu, 24 Apr 2025 17:02:37 +0300
Subject: [PATCH 23/45] before: install

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/cdi-importer/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml
index 59465a8a6d..d80800fdc5 100644
--- a/images/cdi-importer/werf.inc.yaml
+++ b/images/cdi-importer/werf.inc.yaml
@@ -53,7 +53,7 @@ import:
 - image: packages/binaries/nbd
   add: /nbd
   to: /nbd
-  after: setup
+  before: install
 shell:
   install:
   - |

From 12e91e4122a147216301389d3f538a36eb250f47 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Thu, 24 Apr 2025 17:20:26 +0300
Subject: [PATCH 24/45] tree outdir

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index 35d8b66545..f42b4f0b42 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -51,8 +51,8 @@ shell:
       ./configure \
         --prefix=/usr \
         --enable-lfs \
-        --enable-syslog \
-        # --disable-manpages
+        --enable-syslog
+
 
       make -j$(nproc)
 
@@ -63,3 +63,5 @@ shell:
       rm -rf $OUTDIR/usr/include
       rm -rf $OUTDIR/usr/share
       rm -rf $OUTDIR/usr/libexec/installed-tests
+
+      tree $OUTDIR

From a962aa0197f79b6e6b2555054d1743080434ba52 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Thu, 24 Apr 2025 17:21:37 +0300
Subject: [PATCH 25/45] tree

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index f42b4f0b42..2ae885a36e 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -64,4 +64,5 @@ shell:
       rm -rf $OUTDIR/usr/share
       rm -rf $OUTDIR/usr/libexec/installed-tests
 
+      apt-get install -y tree
       tree $OUTDIR

From 1fc3b3e91fb5ccbc19a592b0d9a9e6c4484e6005 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Thu, 24 Apr 2025 17:23:53 +0300
Subject: [PATCH 26/45] tree

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbd/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbd/werf.inc.yaml
index 2ae885a36e..f136ae93bf 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbd/werf.inc.yaml
@@ -18,6 +18,7 @@ packages:
 - git gcc
 - automake autoconf-archive make libtool
 - glib2-devel bison flex setproctitle libnl-devel docbook-utils
+- tree
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -64,5 +65,4 @@ shell:
       rm -rf $OUTDIR/usr/share
       rm -rf $OUTDIR/usr/libexec/installed-tests
 
-      apt-get install -y tree
       tree $OUTDIR

From 88f6bb33f1ca266f7bba7fbd576c2cd1bf217325 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Fri, 25 Apr 2025 11:12:43 +0300
Subject: [PATCH 27/45] move to nbdkit

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 component_versions/version_map.yml            |  2 +-
 images/cdi-importer/werf.inc.yaml             |  8 ++---
 .../binaries/{nbd => nbdkit}/werf.inc.yaml    | 35 ++++++++++++++-----
 3 files changed, 32 insertions(+), 13 deletions(-)
 rename images/packages/binaries/{nbd => nbdkit}/werf.inc.yaml (76%)

diff --git a/component_versions/version_map.yml b/component_versions/version_map.yml
index f747ba0e19..b14a7f5e55 100644
--- a/component_versions/version_map.yml
+++ b/component_versions/version_map.yml
@@ -7,4 +7,4 @@ package:
   xorriso: 1.5.6
   numactl: 2.0.19
   openssl: openssl-3.4.1
-  nbd: 3.26.1
+  nbdkit: 1.39.5
diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml
index d80800fdc5..9f96bfe941 100644
--- a/images/cdi-importer/werf.inc.yaml
+++ b/images/cdi-importer/werf.inc.yaml
@@ -50,9 +50,9 @@ import:
   add: /qemu-img
   to: /relocate
   before: setup
-- image: packages/binaries/nbd
-  add: /nbd
-  to: /nbd
+- image: packages/binaries/nbdkit
+  add: /nbdkit
+  to: /nbdkit
   before: install
 shell:
   install:
@@ -64,5 +64,5 @@ shell:
   - rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
   setup:
   - |
-    cp -a /nbd/. /
+    cp -a /nbdkit/. /
     /relocate_binaries.sh -i "{{ $cdiImporterDependencies.binaries | join " " }}" -o /relocate
diff --git a/images/packages/binaries/nbd/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
similarity index 76%
rename from images/packages/binaries/nbd/werf.inc.yaml
rename to images/packages/binaries/nbdkit/werf.inc.yaml
index f136ae93bf..9bd068b513 100644
--- a/images/packages/binaries/nbd/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -5,20 +5,39 @@ fromImage: builder/scratch
 import:
 - image: {{ $.ImageType }}/{{ $.ImageName }}-builder
   add: /out
-  to: /nbd
+  to: /nbdkit
   before: setup
 
 ---
 {{- $version := get $.Package $.ImageName }}
-{{- $gitRepoUrl := "networkblockdevice/nbd.git" }}
+{{- $gitRepoUrl := "nbdkit/nbdkit.git" }}
 
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
 packages:
 - git gcc
 - automake autoconf-archive make libtool
-- glib2-devel bison flex setproctitle libnl-devel docbook-utils
-- tree
+- makedev
+- bash-completion
+- curl
+- qemu
+- libisoburn
+- e2fsprogs
+- expect
+- gnutls30
+- filesystem
+- socat
+- jq
+- iproute2
+- xz
+- zlib-ng
+- zstd
+- zlib
+- libblkio
+- gcc-defaults
+- libnbd
+- libtorrent-rasterbar
+- libssh
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -44,15 +63,15 @@ shell:
       OUTDIR=/out
       mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
 
-      git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch nbd-{{ $version }} /src
+      git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /src
       cd /src
 
       ./autogen.sh
 
       ./configure \
-        --prefix=/usr \
-        --enable-lfs \
-        --enable-syslog
+        --disable-static \
+        --sbindir=%_bindir \
+        --with-bash-completions
 
 
       make -j$(nproc)

From a341c2a14a96973f866642cb24d95c478c65c549 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Fri, 25 Apr 2025 11:14:18 +0300
Subject: [PATCH 28/45] fix MAKEDEV spelling

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbdkit/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index 9bd068b513..e93736aa48 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -17,7 +17,7 @@ import:
 packages:
 - git gcc
 - automake autoconf-archive make libtool
-- makedev
+- MAKEDEV
 - bash-completion
 - curl
 - qemu

From 3dc42ca83f8a640b5152827af1256f4c1579329f Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Fri, 25 Apr 2025 11:17:54 +0300
Subject: [PATCH 29/45] gnutls30 -> libgnutls30

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbdkit/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index e93736aa48..d264d764f0 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -24,7 +24,7 @@ packages:
 - libisoburn
 - e2fsprogs
 - expect
-- gnutls30
+- libgnutls30
 - filesystem
 - socat
 - jq

From 4f3f103ab2da9d3465f07c5c9bd7fb34d4d4ce45 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Fri, 25 Apr 2025 11:20:22 +0300
Subject: [PATCH 30/45] remove gcc-defaults

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbdkit/werf.inc.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index d264d764f0..0cb2fad880 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -34,7 +34,6 @@ packages:
 - zstd
 - zlib
 - libblkio
-- gcc-defaults
 - libnbd
 - libtorrent-rasterbar
 - libssh

From 91f4896b273f3b42f97de6735858ca572f4433e1 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Fri, 25 Apr 2025 11:21:41 +0300
Subject: [PATCH 31/45] devel

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbdkit/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index 0cb2fad880..6db1a59479 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -35,7 +35,7 @@ packages:
 - zlib
 - libblkio
 - libnbd
-- libtorrent-rasterbar
+- libtorrent-rasterbar-devel
 - libssh
 {{- end -}}
 

From 65caf0447841bb98f3be55313c9ee4b25d11e0c0 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Fri, 25 Apr 2025 11:27:16 +0300
Subject: [PATCH 32/45] udev umount & restart

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbdkit/werf.inc.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index 6db1a59479..ab54ae9b54 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -50,8 +50,10 @@ secrets:
 shell:
   beforeInstall:
     - |
+      /etc/init.d/udevd umount
       apt-get update && apt-get install -y \
         {{ $builderDependencies.packages | join " " }}
+      /etc/init.d/udevd restart
 
       apt-get update
       apt-get clean

From 1b8b66392559043a7cb9303f9df09ab5c5f3b935 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Fri, 25 Apr 2025 11:30:14 +0300
Subject: [PATCH 33/45] remove MAKEDEV

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbdkit/werf.inc.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index ab54ae9b54..f7826ee8d8 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -17,7 +17,7 @@ import:
 packages:
 - git gcc
 - automake autoconf-archive make libtool
-- MAKEDEV
+# - MAKEDEV
 - bash-completion
 - curl
 - qemu
@@ -50,10 +50,10 @@ secrets:
 shell:
   beforeInstall:
     - |
-      /etc/init.d/udevd umount
+      # /etc/init.d/udevd umount
       apt-get update && apt-get install -y \
         {{ $builderDependencies.packages | join " " }}
-      /etc/init.d/udevd restart
+      # /etc/init.d/udevd restart
 
       apt-get update
       apt-get clean

From dedb0927cf30147f516d905e54574c6c083bd236 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Fri, 25 Apr 2025 11:35:36 +0300
Subject: [PATCH 34/45] autoreconf

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbdkit/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index f7826ee8d8..16a46c9f23 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -67,7 +67,7 @@ shell:
       git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /src
       cd /src
 
-      ./autogen.sh
+      autoreconf -i 
 
       ./configure \
         --disable-static \

From 724d919649ee30e5ae45b8d605ee2cf972051fc8 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Fri, 25 Apr 2025 11:40:07 +0300
Subject: [PATCH 35/45] /usr

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbdkit/werf.inc.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index 16a46c9f23..a602ae4419 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -67,11 +67,11 @@ shell:
       git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /src
       cd /src
 
-      autoreconf -i 
+      autoreconf -i
 
       ./configure \
         --disable-static \
-        --sbindir=%_bindir \
+        --prefix=/usr \
         --with-bash-completions
 
 

From 6e1c4cbd6808ba475383626b91021918e79fbb37 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Fri, 25 Apr 2025 11:49:06 +0300
Subject: [PATCH 36/45] tree

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbdkit/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index a602ae4419..0090b6b66a 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -78,6 +78,7 @@ shell:
       make -j$(nproc)
 
       make DESTDIR=$OUTDIR install
+      tree $OUTDIR
       strip $OUTDIR/usr/bin/*
 
       # We don't need man, test and samples files
@@ -85,4 +86,3 @@ shell:
       rm -rf $OUTDIR/usr/share
       rm -rf $OUTDIR/usr/libexec/installed-tests
 
-      tree $OUTDIR

From bd0ac22a55a2b0640edab55785f67c37149e09db Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Fri, 25 Apr 2025 11:50:42 +0300
Subject: [PATCH 37/45] tree

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbdkit/werf.inc.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index 0090b6b66a..df7e0e2f19 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -37,6 +37,7 @@ packages:
 - libnbd
 - libtorrent-rasterbar-devel
 - libssh
+- tree
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}

From a02230e969c31f2e9de89d9db0758ef696f2e0be Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Fri, 25 Apr 2025 16:45:28 +0300
Subject: [PATCH 38/45] nbdkit build

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/cdi-importer/werf.inc.yaml             | 8 ++++++--
 images/packages/binaries/nbdkit/werf.inc.yaml | 7 ++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml
index 9f96bfe941..f619ae771d 100644
--- a/images/cdi-importer/werf.inc.yaml
+++ b/images/cdi-importer/werf.inc.yaml
@@ -19,8 +19,12 @@ libraries:
 packages:
   - libnbd
 binaries:
-  # All nbd binaries
-  - /usr/bin/nbd*
+  # Qemu-img
+  - /usr/bin/qemu-img
+  - /usr/bin/qemu-nbd
+  # nbd bins and libs
+  - /usr/sbin/nbdkit
+  - /lib/nbdkit/*
   # Mount
   - /usr/bin/mount /usr/bin/umount
   # Sqlite libs
diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index df7e0e2f19..4e70d0dbda 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -73,17 +73,14 @@ shell:
       ./configure \
         --disable-static \
         --prefix=/usr \
-        --with-bash-completions
+        --without-bash-completions
 
 
       make -j$(nproc)
 
-      make DESTDIR=$OUTDIR install
-      tree $OUTDIR
-      strip $OUTDIR/usr/bin/*
+      make DESTDIR=$OUTDIR install-strip
 
       # We don't need man, test and samples files
       rm -rf $OUTDIR/usr/include
       rm -rf $OUTDIR/usr/share
-      rm -rf $OUTDIR/usr/libexec/installed-tests
 

From af0d3f998b978b29bdb397e1ee52d252662a5078 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Fri, 25 Apr 2025 16:46:22 +0300
Subject: [PATCH 39/45] remove tree

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbdkit/werf.inc.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index 4e70d0dbda..35b6a6af27 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -37,7 +37,6 @@ packages:
 - libnbd
 - libtorrent-rasterbar-devel
 - libssh
-- tree
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}

From 867c0772318e0a77d3a3c7b1c02aa8c4b44f26ac Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 28 Apr 2025 10:31:12 +0300
Subject: [PATCH 40/45] /usr/lib

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/cdi-importer/werf.inc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml
index f619ae771d..6aa4d28c8f 100644
--- a/images/cdi-importer/werf.inc.yaml
+++ b/images/cdi-importer/werf.inc.yaml
@@ -24,7 +24,7 @@ binaries:
   - /usr/bin/qemu-nbd
   # nbd bins and libs
   - /usr/sbin/nbdkit
-  - /lib/nbdkit/*
+  - /usr/lib/nbdkit/*
   # Mount
   - /usr/bin/mount /usr/bin/umount
   # Sqlite libs

From 0f7324c5537f46bad0377a6a5988ccc58b9cd545 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 28 Apr 2025 10:53:15 +0300
Subject: [PATCH 41/45] remove qemu-img

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/cdi-importer/werf.inc.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml
index 6aa4d28c8f..c2dcb96268 100644
--- a/images/cdi-importer/werf.inc.yaml
+++ b/images/cdi-importer/werf.inc.yaml
@@ -19,9 +19,6 @@ libraries:
 packages:
   - libnbd
 binaries:
-  # Qemu-img
-  - /usr/bin/qemu-img
-  - /usr/bin/qemu-nbd
   # nbd bins and libs
   - /usr/sbin/nbdkit
   - /usr/lib/nbdkit/*

From 4f71c83d8443c6e9e5f28bea739956827ddde01a Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 28 Apr 2025 10:58:38 +0300
Subject: [PATCH 42/45] tree

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/packages/binaries/nbdkit/werf.inc.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index 35b6a6af27..3643b4e435 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -37,6 +37,7 @@ packages:
 - libnbd
 - libtorrent-rasterbar-devel
 - libssh
+- tree
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -82,4 +83,4 @@ shell:
       # We don't need man, test and samples files
       rm -rf $OUTDIR/usr/include
       rm -rf $OUTDIR/usr/share
-
+      tree $OUTDIR

From 4be583cbef0767bb6b7be63f8f58d9f192d888b6 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 28 Apr 2025 11:06:56 +0300
Subject: [PATCH 43/45] tree

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/cdi-importer/werf.inc.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml
index c2dcb96268..6637b6dced 100644
--- a/images/cdi-importer/werf.inc.yaml
+++ b/images/cdi-importer/werf.inc.yaml
@@ -18,10 +18,12 @@ libraries:
 - libsqlite3
 packages:
   - libnbd
+  - tree
 binaries:
   # nbd bins and libs
   - /usr/sbin/nbdkit
-  - /usr/lib/nbdkit/*
+  - /usr/lib/nbdkit/filters
+  - /usr/lib/nbdkit/plugins
   # Mount
   - /usr/bin/mount /usr/bin/umount
   # Sqlite libs
@@ -54,7 +56,7 @@ import:
 - image: packages/binaries/nbdkit
   add: /nbdkit
   to: /nbdkit
-  before: install
+  before: setup
 shell:
   install:
   - |
@@ -65,5 +67,7 @@ shell:
   - rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
   setup:
   - |
+    tree /nbdkit
     cp -a /nbdkit/. /
+    tree /usr/lib
     /relocate_binaries.sh -i "{{ $cdiImporterDependencies.binaries | join " " }}" -o /relocate

From 9f58ce006735f890bdf46ca7006a7a1ade707182 Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 28 Apr 2025 11:11:58 +0300
Subject: [PATCH 44/45] stars

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/cdi-importer/werf.inc.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml
index 6637b6dced..8f6c586cb3 100644
--- a/images/cdi-importer/werf.inc.yaml
+++ b/images/cdi-importer/werf.inc.yaml
@@ -22,8 +22,8 @@ packages:
 binaries:
   # nbd bins and libs
   - /usr/sbin/nbdkit
-  - /usr/lib/nbdkit/filters
-  - /usr/lib/nbdkit/plugins
+  - /usr/lib/nbdkit/filters/*
+  - /usr/lib/nbdkit/plugins/*
   # Mount
   - /usr/bin/mount /usr/bin/umount
   # Sqlite libs
@@ -67,7 +67,5 @@ shell:
   - rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin
   setup:
   - |
-    tree /nbdkit
     cp -a /nbdkit/. /
-    tree /usr/lib
     /relocate_binaries.sh -i "{{ $cdiImporterDependencies.binaries | join " " }}" -o /relocate

From 539927471f9fd8450b3bb5a02f9aa51bedfa7c2a Mon Sep 17 00:00:00 2001
From: Maksim Fedotov <maksim.fedotov@flant.com>
Date: Mon, 28 Apr 2025 11:38:06 +0300
Subject: [PATCH 45/45] remove tree

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
---
 images/cdi-importer/werf.inc.yaml             | 1 -
 images/packages/binaries/nbdkit/werf.inc.yaml | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/images/cdi-importer/werf.inc.yaml b/images/cdi-importer/werf.inc.yaml
index 8f6c586cb3..faa0dc2c19 100644
--- a/images/cdi-importer/werf.inc.yaml
+++ b/images/cdi-importer/werf.inc.yaml
@@ -18,7 +18,6 @@ libraries:
 - libsqlite3
 packages:
   - libnbd
-  - tree
 binaries:
   # nbd bins and libs
   - /usr/sbin/nbdkit
diff --git a/images/packages/binaries/nbdkit/werf.inc.yaml b/images/packages/binaries/nbdkit/werf.inc.yaml
index 3643b4e435..da8cb2fbe4 100644
--- a/images/packages/binaries/nbdkit/werf.inc.yaml
+++ b/images/packages/binaries/nbdkit/werf.inc.yaml
@@ -37,7 +37,6 @@ packages:
 - libnbd
 - libtorrent-rasterbar-devel
 - libssh
-- tree
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -75,7 +74,6 @@ shell:
         --prefix=/usr \
         --without-bash-completions
 
-
       make -j$(nproc)
 
       make DESTDIR=$OUTDIR install-strip
@@ -83,4 +81,3 @@ shell:
       # We don't need man, test and samples files
       rm -rf $OUTDIR/usr/include
       rm -rf $OUTDIR/usr/share
-      tree $OUTDIR